projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rev-list: memory usage reduction.
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
b82f294
..
f176c56
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
};
@@
-166,13
+166,17
@@
int main(int argc, char **argv)
unsigned char sha1[20];
const char *prefix = setup_git_directory();
unsigned char sha1[20];
const char *prefix = setup_git_directory();
+ git_config(git_default_config);
+
for (i = 1; i < argc; i++) {
struct stat st;
char *arg = argv[i];
char *dotdot;
for (i = 1; i < argc; i++) {
struct stat st;
char *arg = argv[i];
char *dotdot;
-
+
if (as_is) {
if (as_is) {
- show_file(arg);
+ if (show_file(arg) && as_is < 2)
+ if (lstat(arg, &st) < 0)
+ die("'%s': %s", arg, strerror(errno));
continue;
}
if (!strcmp(arg,"-n")) {
continue;
}
if (!strcmp(arg,"-n")) {
@@
-192,7
+196,7
@@
int main(int argc, char **argv)
if (*arg == '-') {
if (!strcmp(arg, "--")) {
if (*arg == '-') {
if (!strcmp(arg, "--")) {
- as_is =
1
;
+ as_is =
2
;
/* 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);
@@
-225,12
+229,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)