From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Sep 2015 22:33:56 +0000 (-0700)
Subject: Sync with 2.4.10
X-Git-Tag: v2.5.4~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11a458befcd7662fbe6d2d53c76d49ae2b0fe219

Sync with 2.4.10
---

11a458befcd7662fbe6d2d53c76d49ae2b0fe219
diff --cc Documentation/git.txt
index 2b39aa9f51,a405e4f2e7..b2d88688aa
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,10 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.5.3/git.html[documentation for release 2.5.3]
 +
 +* release notes for
 +  link:RelNotes/2.5.3.txt[2.5.3],
 +  link:RelNotes/2.5.2.txt[2.5.2],
 +  link:RelNotes/2.5.1.txt[2.5.1],
 +  link:RelNotes/2.5.0.txt[2.5].
 +
- * link:v2.4.9/git.html[documentation for release 2.4.9]
+ * link:v2.4.10/git.html[documentation for release 2.4.10]
  
  * release notes for
+   link:RelNotes/2.4.10.txt[2.4.10],
    link:RelNotes/2.4.9.txt[2.4.9],
    link:RelNotes/2.4.8.txt[2.4.8],
    link:RelNotes/2.4.7.txt[2.4.7],
diff --cc combine-diff.c
index 30c7eb6d3c,5cae5fbd62..0f62f54b5e
--- a/combine-diff.c
+++ b/combine-diff.c
@@@ -419,8 -419,10 +419,10 @@@ static void combine_diff(const struct o
  	state.num_parent = num_parent;
  	state.n = n;
  
- 	xdi_diff_outf(&parent_file, result_file, consume_line, &state,
- 		      &xpp, &xecfg);
+ 	if (xdi_diff_outf(&parent_file, result_file, consume_line, &state,
+ 			  &xpp, &xecfg))
+ 		die("unable to generate combined diff for %s",
 -		    sha1_to_hex(parent));
++		    oid_to_hex(parent));
  	free(parent_file.ptr);
  
  	/* Assign line numbers for this parent.