diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 17:53:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 17:53:40 (GMT) |
| commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
| tree | ac786621832f1ac568761e96989ca984a836530e /patch-ids.c | |
| parent | 3f835949e9b800619136f2511e84000c95916d6e (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-738c2187604756fea3901554a49f9137e02ed0ef.zip git-738c2187604756fea3901554a49f9137e02ed0ef.tar.gz git-738c2187604756fea3901554a49f9137e02ed0ef.tar.bz2 | |
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'patch-ids.c')
| -rw-r--r-- | patch-ids.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/patch-ids.c b/patch-ids.c index 5717257..bc8a28f 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -39,8 +39,7 @@ int init_patch_ids(struct patch_ids *ids) memset(ids, 0, sizeof(*ids)); diff_setup(&ids->diffopts); DIFF_OPT_SET(&ids->diffopts, RECURSIVE); - if (diff_setup_done(&ids->diffopts) < 0) - return error("diff_setup_done failed"); + diff_setup_done(&ids->diffopts); return 0; } |