undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check return value from diff_setup_done()

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-08-09 12:45:27 -07:00
parent 1d17c25c38
commit 72ee96c0f1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-diff.c
View File

@ -253,7 +253,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &rev, NULL); argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format) { if (!rev.diffopt.output_format) {
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
diff_setup_done(&rev.diffopt); if (diff_setup_done(&rev.diffopt) < 0)
die("diff_setup_done failed");
} }
/* Do we have --cached and not have a pending object, then /* Do we have --cached and not have a pending object, then

3
revision.c
View File

@ -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.output_format = DIFF_FORMAT_PATCH;
} }
revs->diffopt.abbrev = revs->abbrev; revs->diffopt.abbrev = revs->abbrev;
diff_setup_done(&revs->diffopt); if (diff_setup_done(&revs->diffopt) < 0)
die("diff_setup_done failed");
return left; return left;
} }