summaryrefslogtreecommitdiff
path: root/rev-parse.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-23 22:32:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-23 22:32:17 (GMT)
commit58eaf287f1b25f6427b06bd72d8e555615828aeb (patch)
tree6d86eab47d70925761f5923debeaa19c348fb371 /rev-parse.c
parent89305da8a230e435109cc97ed88241c158813523 (diff)
parent2a29da7c6d6103c4719c71f6cce88e853260912c (diff)
downloadgit-58eaf287f1b25f6427b06bd72d8e555615828aeb.zip
git-58eaf287f1b25f6427b06bd72d8e555615828aeb.tar.gz
git-58eaf287f1b25f6427b06bd72d8e555615828aeb.tar.bz2
Merge refs/heads/master from .
Diffstat (limited to 'rev-parse.c')
-rw-r--r--rev-parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rev-parse.c b/rev-parse.c
index f1f5163..9281b45 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -107,7 +107,7 @@ static void show_arg(char *arg)
if (do_rev_argument && is_rev_argument(arg))
show_rev_arg(arg);
else
- show_norev(arg);
+ show(arg);
}
static void show_default(void)
@@ -122,7 +122,7 @@ static void show_default(void)
show_rev(NORMAL, sha1, s);
return;
}
- show_arg(s);
+ show_norev(s);
}
}
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
if (*arg == '-') {
if (!strcmp(arg, "--")) {
show_default();
- if (revs_only)
+ if (revs_only || flags_only)
break;
as_is = 1;
}