diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
| commit | d7b6c3c0f54b951c85cd41c6e6571c65cf090111 (patch) | |
| tree | 44c009ddd29ab5a986dba9028d0b57a0b2e03201 /revision.c | |
| parent | pass DESTDIR to the generated perl/Makefile (diff) | |
| parent | git-apply --binary: clean up and prepare for --reverse (diff) | |
| download | tgif-d7b6c3c0f54b951c85cd41c6e6571c65cf090111.tar.xz | |
Merge branch 'master' into pb/gitpm
* master: (166 commits)
git-apply --binary: clean up and prepare for --reverse
Fix detection of ipv6 on Solaris
Look for sockaddr_storage in sys/socket.h
Solaris has strlcpy() at least since version 8
git-apply --reverse: simplify reverse option.
t4116 apply --reverse test
Make sha1flush void and remove conditional return.
Make upload_pack void and remove conditional return.
Make track_tree_refs void.
Make pack_objects void.
Make fsck_dir void.
Make checkout_all void.
Make show_entry void
Make pprint_tag void and cleans up call in cmd_cat_file.
Remove combine-diff.c::uninteresting()
read-cache.c cleanup
http-push.c cleanup
diff.c cleanup
builtin-push.c cleanup
builtin-grep.c cleanup
...
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c index a58257ad80..5a91d06b98 100644 --- a/revision.c +++ b/revision.c @@ -936,7 +936,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch revs->diffopt.output_format = DIFF_FORMAT_PATCH; } revs->diffopt.abbrev = revs->abbrev; - diff_setup_done(&revs->diffopt); + if (diff_setup_done(&revs->diffopt) < 0) + die("diff_setup_done failed"); return left; } |