From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Sep 2014 19:54:03 +0000 (-0700)
Subject: Merge branch 'sb/blame-msg-i18n'
X-Git-Tag: v2.2.0-rc0~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=929df991c25497ecdaf1cd605eec1b3ac4f1c6e5;p=thirdparty%2Fgit.git

Merge branch 'sb/blame-msg-i18n'

* sb/blame-msg-i18n:
  builtin/blame.c: add translation to warning about failed revision walk
---

929df991c25497ecdaf1cd605eec1b3ac4f1c6e5
diff --cc builtin/blame.c
index 17d30d00aa,b8c5f747bf..ca4ba6ff15
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2700,11 -2438,14 +2700,11 @@@ parse_done
  	 * uninteresting.
  	 */
  	if (prepare_revision_walk(&revs))
- 		die("revision walk setup failed");
+ 		die(_("revision walk setup failed"));
  
  	if (is_null_sha1(sb.final->object.sha1)) {
 -		char *buf;
  		o = sb.final->util;
 -		buf = xmalloc(o->file.size + 1);
 -		memcpy(buf, o->file.ptr, o->file.size + 1);
 -		sb.final_buf = buf;
 +		sb.final_buf = xmemdupz(o->file.ptr, o->file.size);
  		sb.final_buf_size = o->file.size;
  	}
  	else {