]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'sb/blame-msg-i18n'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:03 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:03 +0000 (12:54 -0700)
* sb/blame-msg-i18n:
  builtin/blame.c: add translation to warning about failed revision walk

1  2 
builtin/blame.c

diff --cc builtin/blame.c
index 17d30d00aa3f6c4d0f62cae6603f9003dd2f2395,b8c5f747bf01c43de2ec1fdf3b7e6ea3150d5b90..ca4ba6ff15b91d9cbb6b2ce3783fa3e69d0f3ff1
@@@ -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 {