diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
| commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
| tree | b0370caa6322930a13898673c5a559aef20c8791 /builtin/checkout.c | |
| parent | 31190841049549b5daaffeb0b9888ebed0bbfc8a (diff) | |
| parent | e09e4024a070e666ed40b66442e8151b91d623e4 (diff) | |
| download | git-1c88a6d17492b197b9b3298cbc34efa804928302.tar.gz git-1c88a6d17492b197b9b3298cbc34efa804928302.tar.xz | |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 d812219b3..7d922c612 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -316,8 +316,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); } |