Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 17:52:33 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 17:52:33 +0000 (10:52 -0700)
l10n for Git 2.14.0 round 2

* tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
l10n: zh_CN: review for git v2.14.0 l10n
l10n: ko.po: Update Korean translation
l10n: zh_CN: for git v2.14.0 l10n round 2
l10n: de.po: various fixes in German translation
l10n: ru.po: update Russian translation
l10n: fr.po v2.14.0 rnd 2
l10n: fr.po Fix some french typos
l10n: fr.po Fix typo
l10n: fr.po Fix some translations
l10n: de.po: update German translation
l10n: vi.po (3213t): Updated 9 new strings
l10n: Update Catalan translation
l10n: bg.po: Updated Bulgarian translation (3213t)

Documentation/RelNotes/2.13.4.txt
GIT-VERSION-GEN
blame.c
index 4f46ef6fca2493e8872f87f4c8b5b6440a1e75da..9a9f8f9599df8fa2a5ba9b5fb97254dea51844db 100644 (file)
@@ -8,3 +8,21 @@ Fixes since v2.13.3
 
  * A recent update broke an alias that contained an uppercase letter,
    which has been fixed.
+
+ * On Cygwin, similar to Windows, "git push //server/share/repository"
+   ought to mean a repository on a network share that can be accessed
+   locally, but this did not work correctly due to stripping the double
+   slashes at the beginning.
+
+ * The progress meter did not give a useful output when we haven't had
+   0.5 seconds to measure the throughput during the interval.  Instead
+   show the overall throughput rate at the end, which is a much more
+   useful number.
+
+ * We run an early part of "git gc" that deals with refs before
+   daemonising (and not under lock) even when running a background
+   auto-gc, which caused multiple gc processes attempting to run the
+   early part at the same time.  This is now prevented by running the
+   early part also under the GC lock.
+
+Also contains a handful of small code and documentation clean-ups.
index 8bdf5a367e84037aad8a96e38e9ecb70aa3db6d6..96c688bd21c5cfae1b5e6e83e8c931a5b75889f2 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.14.0-rc0
+DEF_VER=v2.14.0-rc1
 
 LF='
 '
diff --git a/blame.c b/blame.c
index 91e26e93e8a23d0af63e1bc8a74e9f7690276ab4..f575e9cbf4e3224049fe43b7f794d2dd8770eda7 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -1663,7 +1663,7 @@ static struct commit *find_single_final(struct rev_info *revs,
                name = revs->pending.objects[i].name;
        }
        if (name_p)
-               *name_p = name;
+               *name_p = xstrdup_or_null(name);
        return found;
 }
 
@@ -1735,7 +1735,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
                die("No commit to dig up from?");
 
        if (name_p)
-               *name_p = name;
+               *name_p = xstrdup(name);
        return found;
 }
 
@@ -1843,6 +1843,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam
 
        if (orig)
                *orig = o;
+
+       free((char *)final_commit_name);
 }