From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jun 2009 14:48:44 +0000 (-0700)
Subject: Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
X-Git-Tag: v1.6.3.2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=456cb4cf3ef6e3dec637b7061b0c834b62eba0f5;p=git.git

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
---

456cb4cf3ef6e3dec637b7061b0c834b62eba0f5
diff --cc xdiff/xmerge.c
index d9737f04c,1ef1d358c..1cb65a951
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@@ -563,23 -470,22 +563,22 @@@ int xdl_merge(mmfile_t *orig, mmfile_t 
  		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,
 -				      level, xpp, result);
++				      flags, xpp, result);
  	}
+ 	xdl_free_script(xscr1);
+ 	xdl_free_script(xscr2);
+ 
  	xdl_free_env(&xe1);
  	xdl_free_env(&xe2);