On Mon, May 16, 2011 at 22:45, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx> writes:
>
>> Oh, and for all the convertion of:
>>
>> Â Â echo >&2 "$(gettext "foobar")"
>>
>> I've already done:
>>
>> Â Â (
>> Â Â Â Â gettext "foobar" &&
>> Â Â Â Â echo
>> Â Â ) >&2
>
> Sorry, but what problem are you trying to solve? ÂThe output from
>
> Â Â$ gettext "foobar"
>
> may have 0, 1 or more LF at the end, but wouldn't
>
> Â Âecho >&2 "$(gettext "foobar")"
>
> terminate with a single LF in any case?
>
> Ahh, perhaps I was the one who said something stupid like:
>
> Â Â Â Âecho >&2 "$(cmd)"
>
> should be equivalent to
>
> Â Â Â Âcmd >&2
>
> which is not the case when output from cmd does not end with a single LF
> (i.e. either an incomplete line, or with trailing blank lines).
>
> Sorry, if that is what you are trying to address, please let me take that
> back.
Yeah, you said:
>> + echo >&2 "$(eval_gettext "Warning: fetch updated the current
branch head.
>> +Warning: fast-forwarding your working tree from
>> +Warning: commit \$orig_head.")"
>
> echo "$(...)"
>
> sounds quite wasteful and harder to read than necessary.
> The same also happens in later patches.
A very good point. Just letting eval_gettext write out to >&2 should be
both sufficient and inifinitely more readable.
-- http://www.spinics.net/lists/git/msg157376.html
Which is why I rewrote all the relevant patches to look like:
diff --git a/git-pull.sh b/git-pull.sh
index 06dcd81..a10b129 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -217,9 +217,12 @@ then
# $orig_head commit, but we are merging into $curr_head.
# First update the working tree to match $curr_head.
- echo >&2 "Warning: fetch updated the current branch head."
- echo >&2 "Warning: fast-forwarding your working tree from"
- echo >&2 "Warning: commit $orig_head."
+ (
+ eval_gettext "Warning: fetch updated the current
branch head.
+Warning: fast-forwarding your working tree from
+Warning: commit \$orig_head." &&
+ echo
+ ) >&2
git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" ||
die "$(eval_gettext "Cannot fast-forward your working tree.
I wrote them using echo "$(gettext "foo")" initially because I thought
bending over backwards like this was silly.
You want me to go and change it back now?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html