From: Junio C Hamano Date: Wed, 22 Aug 2012 18:52:26 +0000 (-0700) Subject: Merge branch 'tr/void-diff-setup-done' X-Git-Tag: v1.8.0-rc0~147 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9cd33bbc529bfa830c687d377433c46474d10e6a Merge branch 'tr/void-diff-setup-done' Remove unnecessary code. * tr/void-diff-setup-done: diff_setup_done(): return void --- 9cd33bbc529bfa830c687d377433c46474d10e6a diff --cc diff-no-index.c index 7d805a06af,b245ca8ad8..b34b5aa7df --- a/diff-no-index.c +++ b/diff-no-index.c @@@ -258,13 -256,11 +258,12 @@@ void diff_no_index(struct rev_info *rev DIFF_OPT_SET(&revs->diffopt, NO_INDEX); revs->max_count = -2; - if (diff_setup_done(&revs->diffopt) < 0) - die("diff_setup_done failed"); + diff_setup_done(&revs->diffopt); - if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0], - revs->diffopt.pathspec.raw[1])) + setup_diff_pager(&revs->diffopt); + DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); + + if (queue_diff(&revs->diffopt, paths[0], paths[1])) exit(1); diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/"); diffcore_std(&revs->diffopt);