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
507b531
..
5a98982
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-32,7
+32,9
@@
static int revs_count = 0;
static int is_rev_argument(const char *arg)
{
static const char *rev_args[] = {
static int is_rev_argument(const char *arg)
{
static const char *rev_args[] = {
+ "--all",
"--bisect",
"--bisect",
+ "--dense",
"--header",
"--max-age=",
"--max-count=",
"--header",
"--max-age=",
"--max-count=",
@@
-43,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
@@
-150,6
+153,13
@@
static void show_datestring(const char *flag, const char *datestr)
show(buffer);
}
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;
int main(int argc, char **argv)
{
int i, as_is = 0, verify = 0;
@@
-161,12
+171,15
@@
int main(int argc, char **argv)
char *dotdot;
if (as_is) {
char *dotdot;
if (as_is) {
- show(arg);
+ show
_file
(arg);
continue;
}
if (*arg == '-') {
if (!strcmp(arg, "--")) {
as_is = 1;
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")) {
continue;
}
if (!strcmp(arg, "--default")) {
@@
-281,9
+294,8
@@
int main(int argc, char **argv)
}
if (verify)
die("Needed a single revision");
}
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)
}
show_default();
if (verify && revs_count != 1)