diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
| commit | e634aec752642dcf86c3fc82025e43381d6768c2 (patch) | |
| tree | a589b6756894d18c841ac61499e5d2c9beda36fd /rev-parse.c | |
| parent | a1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff) | |
| parent | 80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff) | |
GIT 0.99.9av0.99.9a
... to contain the RPM workaround.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-parse.c')
| -rw-r--r-- | rev-parse.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/rev-parse.c b/rev-parse.c index 41b9dae429..5a98982511 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -34,6 +34,7 @@ static int is_rev_argument(const char *arg) static const char *rev_args[] = { "--all", "--bisect", + "--dense", "--header", "--max-age=", "--max-count=", @@ -44,6 +45,7 @@ static int is_rev_argument(const char *arg) "--parents", "--pretty", "--show-breaks", + "--sparse", "--topo-order", "--unpacked", NULL @@ -151,6 +153,13 @@ static void show_datestring(const char *flag, const char *datestr) show(buffer); } +static void show_file(const char *arg) +{ + show_default(); + if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) + show(arg); +} + int main(int argc, char **argv) { int i, as_is = 0, verify = 0; @@ -162,12 +171,15 @@ int main(int argc, char **argv) char *dotdot; if (as_is) { - show(arg); + show_file(arg); continue; } if (*arg == '-') { if (!strcmp(arg, "--")) { as_is = 1; + /* Pass on the "--" if we show anything but files.. */ + if (filter & (DO_FLAGS | DO_REVS)) + show_file(arg); continue; } if (!strcmp(arg, "--default")) { @@ -282,9 +294,8 @@ int main(int argc, char **argv) } if (verify) die("Needed a single revision"); - if ((filter & (DO_NONFLAGS|DO_NOREV)) == - (DO_NONFLAGS|DO_NOREV)) - show(arg); + as_is = 1; + show_file(arg); } show_default(); if (verify && revs_count != 1) |