projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give python a chance to find "backported" modules
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
243f89f
..
5a98982
100644
(file)
--- 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",
static const char *rev_args[] = {
"--all",
"--bisect",
+ "--dense",
"--header",
"--max-age=",
"--max-count=",
"--header",
"--max-age=",
"--max-count=",
@@
-44,6
+45,7
@@
static int is_rev_argument(const char *arg)
"--parents",
"--pretty",
"--show-breaks",
"--parents",
"--pretty",
"--show-breaks",
+ "--sparse",
"--topo-order",
"--unpacked",
NULL
"--topo-order",
"--unpacked",
NULL
@@
-153,6
+155,7
@@
static void show_datestring(const char *flag, const char *datestr)
static void show_file(const char *arg)
{
static void show_file(const char *arg)
{
+ show_default();
if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
show(arg);
}
if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
show(arg);
}
@@
-174,7
+177,6
@@
int main(int argc, char **argv)
if (*arg == '-') {
if (!strcmp(arg, "--")) {
as_is = 1;
if (*arg == '-') {
if (!strcmp(arg, "--")) {
as_is = 1;
- show_default();
/* Pass on the "--" if we show anything but files.. */
if (filter & (DO_FLAGS | DO_REVS))
show_file(arg);
/* Pass on the "--" if we show anything but files.. */
if (filter & (DO_FLAGS | DO_REVS))
show_file(arg);
@@
-292,6
+294,7
@@
int main(int argc, char **argv)
}
if (verify)
die("Needed a single revision");
}
if (verify)
die("Needed a single revision");
+ as_is = 1;
show_file(arg);
}
show_default();
show_file(arg);
}
show_default();