提交 72ee96c0 编写于 作者: J Junio C Hamano

check return value from diff_setup_done()

Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 1d17c25c
......@@ -253,7 +253,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format) {
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
......
......@@ -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.abbrev = revs->abbrev;
diff_setup_done(&revs->diffopt);
if (diff_setup_done(&revs->diffopt) < 0)
die("diff_setup_done failed");
return left;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册