summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-02 14:48:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-02 14:48:44 (GMT)
commit456cb4cf3ef6e3dec637b7061b0c834b62eba0f5 (patch)
tree193fa9cb1011cc29e72e082e1d3d83cfe65ae841 /xdiff
parent3489428367e0d9d95cf90a8a7f537db958f9a78a (diff)
parent5719db91ce5915ee07c50f1afdc94fe34e91529f (diff)
downloadgit-456cb4cf3ef6e3dec637b7061b0c834b62eba0f5.zip
git-456cb4cf3ef6e3dec637b7061b0c834b62eba0f5.tar.gz
git-456cb4cf3ef6e3dec637b7061b0c834b62eba0f5.tar.bz2
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
* cb/maint-1.6.0-xdl-merge-fix: Change xdl_merge to generate output even for null merges t6023: merge-file fails to output anything for a degenerate merge Conflicts: xdiff/xmerge.c
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xmerge.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index d9737f0..1cb65a9 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -563,23 +563,22 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
return -1;
}
status = 0;
- if (xscr1 || xscr2) {
- if (!xscr1) {
- result->ptr = xdl_malloc(mf2->size);
- memcpy(result->ptr, mf2->ptr, mf2->size);
- result->size = mf2->size;
- } else if (!xscr2) {
- result->ptr = xdl_malloc(mf1->size);
- memcpy(result->ptr, mf1->ptr, mf1->size);
- result->size = mf1->size;
- } else {
- status = xdl_do_merge(&xe1, xscr1, name1,
- &xe2, xscr2, name2,
- flags, xpp, result);
- }
- xdl_free_script(xscr1);
- xdl_free_script(xscr2);
+ if (!xscr1) {
+ result->ptr = xdl_malloc(mf2->size);
+ memcpy(result->ptr, mf2->ptr, mf2->size);
+ result->size = mf2->size;
+ } else if (!xscr2) {
+ result->ptr = xdl_malloc(mf1->size);
+ memcpy(result->ptr, mf1->ptr, mf1->size);
+ result->size = mf1->size;
+ } else {
+ status = xdl_do_merge(&xe1, xscr1, name1,
+ &xe2, xscr2, name2,
+ flags, xpp, result);
}
+ xdl_free_script(xscr1);
+ xdl_free_script(xscr2);
+
xdl_free_env(&xe1);
xdl_free_env(&xe2);