Change the eval_gettext() invocations to use the GIT_I18N_VARIABLE_ prefix for variables used in eval_gettext. On Windows environment variables are case insensitive, so e.g. $PATH clashes with $path. By using a sufficiently unique prefix we work around that issue. Signed-off-by: Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx> --- git-pull.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index a10b129..d5f25a6 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -217,17 +217,18 @@ then # $orig_head commit, but we are merging into $curr_head. # First update the working tree to match $curr_head. + GIT_I18N_VARIABLE_orig_head=$orig_head ( eval_gettext "Warning: fetch updated the current branch head. Warning: fast-forwarding your working tree from -Warning: commit \$orig_head." && +Warning: commit \$GIT_I18N_VARIABLE_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. After making sure that you saved anything precious from -$ git diff \$orig_head +$ git diff \$GIT_I18N_VARIABLE_orig_head output, run $ git reset --hard to recover.")" -- 1.7.5.1 -- 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