From 28bfa145e4dedad9b2c81857b77ca13871c77853 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 11 May 2008 18:27:36 +0200 Subject: rev-parse: fix using "--default" with "--verify" Before this patch, something like: $ git rev-parse --verify HEAD --default master did not work, while: $ git rev-parse --default master --verify HEAD worked. This patch fixes that, so that they both work (assuming HEAD and master can be parsed). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin-rev-parse.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin-rev-parse.c') diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 0e59707323..7dbf282f5e 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -583,6 +583,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) continue; verify_filename(prefix, arg); } + if (verify && revs_count == 1) + return 0; show_default(); if (verify && revs_count != 1) die_no_single_rev(quiet); -- cgit v1.2.3