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/thin' into next
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
9161fae
..
19a5ef7
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-39,13
+39,12
@@
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",
"--date-order",
"--sparse",
"--topo-order",
"--date-order",
@@
-167,6
+166,8
@@
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];
for (i = 1; i < argc; i++) {
struct stat st;
char *arg = argv[i];
@@
-226,12
+227,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)