projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/pull'
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
9cec33b
..
f90e999
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-39,15
+39,15
@@
static int is_rev_argument(const char *arg)
"--header",
"--max-age=",
"--max-count=",
"--header",
"--max-age=",
"--max-count=",
- "--merge-order",
"--min-age=",
"--no-merges",
"--objects",
"--min-age=",
"--no-merges",
"--objects",
+ "--objects-edge",
"--parents",
"--pretty",
"--parents",
"--pretty",
- "--show-breaks",
"--sparse",
"--topo-order",
"--sparse",
"--topo-order",
+ "--date-order",
"--unpacked",
NULL
};
"--unpacked",
NULL
};
@@
-150,11
+150,14
@@
static void show_datestring(const char *flag, const char *datestr)
show(buffer);
}
show(buffer);
}
-static
void
show_file(const char *arg)
+static
int
show_file(const char *arg)
{
show_default();
{
show_default();
- if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+ if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
{
show(arg);
show(arg);
+ return 1;
+ }
+ return 0;
}
int main(int argc, char **argv)
}
int main(int argc, char **argv)
@@
-222,12
+225,12
@@
int main(int argc, char **argv)
continue;
}
if (!strcmp(arg, "--short") ||
continue;
}
if (!strcmp(arg, "--short") ||
- !strncmp(arg, "--short=",
9
)) {
+ !strncmp(arg, "--short=",
8
)) {
filter &= ~(DO_FLAGS|DO_NOREV);
verify = 1;
abbrev = DEFAULT_ABBREV;
filter &= ~(DO_FLAGS|DO_NOREV);
verify = 1;
abbrev = DEFAULT_ABBREV;
- if (arg[
8
] == '=')
- abbrev = strtoul(arg +
9
, NULL, 10);
+ if (arg[
7
] == '=')
+ abbrev = strtoul(arg +
8
, NULL, 10);
if (abbrev < MINIMUM_ABBREV)
abbrev = MINIMUM_ABBREV;
else if (40 <= abbrev)
if (abbrev < MINIMUM_ABBREV)
abbrev = MINIMUM_ABBREV;
else if (40 <= abbrev)
@@
-329,14
+332,13
@@
int main(int argc, char **argv)
show_rev(REVERSED, sha1, arg+1);
continue;
}
show_rev(REVERSED, sha1, arg+1);
continue;
}
+ as_is = 1;
+ if (!show_file(arg))
+ continue;
if (verify)
die("Needed a single revision");
if (verify)
die("Needed a single revision");
- if ((filter & DO_REVS) &&
- (filter & DO_NONFLAGS) && /* !def && */
- lstat(arg, &st) < 0)
+ if (lstat(arg, &st) < 0)
die("'%s': %s", arg, strerror(errno));
die("'%s': %s", arg, strerror(errno));
- as_is = 1;
- show_file(arg);
}
show_default();
if (verify && revs_count != 1)
}
show_default();
if (verify && revs_count != 1)