projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11
[git.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index 74aa77ce4be2bf23387a32e42cbdc72154c529c2..7d62904f619fcd775f7ed7e7cff00d44005f3a5b 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-126,8
+126,7
@@
static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
- if (diff_setup_done(&opt) < 0)
- die("diff_setup_done failed");
+ diff_setup_done(&opt);
diff_tree_sha1(base, remote, "", &opt);
diffcore_std(&opt);
diff_tree_sha1(base, remote, "", &opt);
diffcore_std(&opt);
@@
-190,8
+189,7
@@
static void diff_tree_local(struct notes_merge_options *o,
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
- if (diff_setup_done(&opt) < 0)
- die("diff_setup_done failed");
+ diff_setup_done(&opt);
diff_tree_sha1(base, local, "", &opt);
diffcore_std(&opt);
diff_tree_sha1(base, local, "", &opt);
diffcore_std(&opt);