Merge branch 'rl/maint-stash-i18n-save-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:24:22 +0000 (15:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 May 2012 22:24:22 +0000 (15:24 -0700)
i18n marking for an error message for "git stash --notavalidoption"
was incorrect.

By Ross Lagerwall
* rl/maint-stash-i18n-save-error:
stash: use eval_gettextln correctly

git-stash.sh
index fe4ab28b2e10f85b20ff7892663cbb141fad4723..4e2c7f83314954de6655b0d1bff773c31dfe3ed1 100755 (executable)
@@ -199,8 +199,8 @@ save_stash () {
                        #    $ git stash save --blah-blah 2>&1 | head -n 2
                        #    error: unknown option for 'stash save': --blah-blah
                        #           To provide a message, use git stash save -- '--blah-blah'
-                       eval_gettextln "$("error: unknown option for 'stash save': \$option
-       To provide a message, use git stash save -- '\$option'")"
+                       eval_gettextln "error: unknown option for 'stash save': \$option
+       To provide a message, use git stash save -- '\$option'"
                        usage
                        ;;
                *)