Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Fix git-rev-parse --default and --flags handling
author
Linus Torvalds
<torvalds@osdl.org>
Tue, 23 Aug 2005 17:47:54 +0000
(10:47 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 23 Aug 2005 19:42:58 +0000
(12:42 -0700)
This makes the argument to --default and any --flags arguments should up
correctly, and makes "--" together with --flags act sanely.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
rev-parse.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
7fc9d69
)
diff --git
a/rev-parse.c
b/rev-parse.c
index f1f5163447e98f1afb65137fd7cc9db7ff793b29..9281b45d1f54dda858d7adff14e90f8e94eccc13 100644
(file)
--- 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;
}