projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/config'
[git.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index
ad78efd
..
2294b16
100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-574,7
+574,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->max_count = atoi(arg + 12);
continue;
}
revs->max_count = atoi(arg + 12);
continue;
}
- /* accept -<digit>, like traditi
l
nal "head" */
+ /* accept -<digit>, like traditi
o
nal "head" */
if ((*arg == '-') && isdigit(arg[1])) {
revs->max_count = atoi(arg + 1);
continue;
if ((*arg == '-') && isdigit(arg[1])) {
revs->max_count = atoi(arg + 1);
continue;
@@
-694,6
+694,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
if (!strcmp(arg, "-c")) {
revs->diff = 1;
}
if (!strcmp(arg, "-c")) {
revs->diff = 1;
+ revs->dense_combined_merges = 0;
revs->combine_merges = 1;
continue;
}
revs->combine_merges = 1;
continue;
}
@@
-793,7
+794,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
local_flags = UNINTERESTING;
arg++;
}
local_flags = UNINTERESTING;
arg++;
}
- if (get_sha1(arg, sha1)
< 0
) {
+ if (get_sha1(arg, sha1)) {
int j;
if (seen_dashdash || local_flags)
int j;
if (seen_dashdash || local_flags)
@@
-819,7
+820,7
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
- if (get_sha1(def, sha1)
< 0
)
+ if (get_sha1(def, sha1))
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);