diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
| commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
| tree | ac786621832f1ac568761e96989ca984a836530e /builtin/checkout.c | |
| parent | Merge branch 'tr/merge-recursive-flush' into maint-1.7.11 (diff) | |
| parent | diff_setup_done(): return void (diff) | |
| download | tgif-738c2187604756fea3901554a49f9137e02ed0ef.tar.xz | |
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 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index e060efb2a2..45aa0a8701 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -315,8 +315,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts) init_revisions(&rev, NULL); rev.diffopt.flags = opts->flags; rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; - if (diff_setup_done(&rev.diffopt) < 0) - die(_("diff_setup_done failed")); + diff_setup_done(&rev.diffopt); add_pending_object(&rev, head, NULL); run_diff_index(&rev, 0); } |