Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 3 messages
l10n: zh_CN: various fixes on command arguments
l10n: vi.po(2298t): Updated 3 new strings
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 2
l10n: git.pot: v2.3.0 round 2 (3 updated)
l10n: de.po: translate 13 new messages
l10n: de.po: fix typo
l10n: de.po: translate "track" as "versionieren"
l10n: zh_CN: translations for git v2.3.0-rc0
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 1
l10n: vi.po(2298t): Updated and change Plural-Forms
l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
l10n: ca.po: various fixes

diff --git a/Documentation/RelNotes/2.3.0.txt b/Documentation/RelNotes/2.3.0.txt
index 72ef007a002176708bbbac28692ec4aabfa80dcc..11dc73c383bf35db349dda7a7fee1dcdc6b616f1 100644 (file)
--- a/Documentation/RelNotes/2.3.0.txt
+++ b/Documentation/RelNotes/2.3.0.txt
@@ -136,6 +136,11 @@ Unless otherwise noted, all the fixes since v2.2 in the maintenance
 track are contained in this release (see the maintenance releases'
 notes for details).
 
+ * "git http-push" over WebDAV (aka dumb http-push) was broken in
+   v2.2.2 when parsing a symbolic ref, resulting in a bogus request
+   that gets rejected by recent versions of cURL library.
+   (merge f6786c8 jk/http-push-symref-fix later to maint).
+
  * The logic in "git bisect bad HEAD" etc. to avoid forcing the test
    of the common ancestor of bad and good commits was broken.
    (merge 07913d5 cc/bisect-rev-parsing later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 57dc9635aaf9f699bb56418701e05473d983de91..b8624d3eb9116d19e229c9e021655e7d87f3b173 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.3.0-rc0
+DEF_VER=v2.3.0-rc1
 
 LF='
 '

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 691eeda345361bea8be20d73b32b312b08b58a4e..365228aa8d805bdf86a6eecccdc088068ba000d2 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -7,9 +7,9 @@
 
 static const char* show_branch_usage[] = {
     N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-       "                      [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-       "                      [--more=<n> | --list | --independent | --merge-base]\n"
-       "              [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
+       "               [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+       "               [--more=<n> | --list | --independent | --merge-base]\n"
+       "               [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
     N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
     NULL
 };

diff --git a/color.c b/color.c
index 809b359a42d426d61f0452e89725177eadeb54cb..9027352ad7786746537adea9007bd46f46edbb4e 100644 (file)
--- a/color.c
+++ b/color.c
@@ -112,6 +112,7 @@ static int parse_color(struct color *out, const char *name, int len)
                } else if (val < 8) {
                        out->type = COLOR_ANSI;
                        out->value = val;
+                       return 0;
                } else if (val < 256) {
                        out->type = COLOR_256;
                        out->value = val;

diff --git a/http-push.c b/http-push.c
index 952f8ede49daf4e275c42cc0682bb01c4c58446a..0beb7ab67ffc93a6c8fe8517d711945e2c033b7d 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1577,6 +1577,9 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
        if (buffer.len == 0)
                return;
 
+       /* Cut off trailing newline. */
+       strbuf_rtrim(&buffer);
+
        /* If it's a symref, set the refname; otherwise try for a sha1 */
        if (skip_prefix(buffer.buf, "ref: ", &name)) {
                *symref = xmemdupz(name, buffer.len - (name - buffer.buf));

diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 267c43bd95c9b7dbbc5991e7312deeb5527a175a..4d20feacfe8b7688c9bfefc43d60ba4f1a6c2cfc 100755 (executable)
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -60,6 +60,10 @@ test_expect_success 'absurdly long color specification' '
          "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
 '
 
+test_expect_success '0-7 are aliases for basic ANSI color names' '
+       color "0 7" "[30;47m"
+'
+
 test_expect_success '256 colors' '
        color "254 bold 255" "[1;38;5;254;48;5;255m"
 '