From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:09:27 +0000 (-0700)
Subject: Merge branch 'ab/i18n-scripts' into next
X-Git-Tag: v1.7.7-rc0~116
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61f44720a9c360dd30053a558e58c8a41d6f3843;p=git.git

Merge branch 'ab/i18n-scripts' into next

* ab/i18n-scripts: (48 commits)
  i18n: git-bisect bisect_next_check "You need to" message
  i18n: git-bisect [Y/n] messages
  i18n: git-bisect bisect_replay + $1 messages
  i18n: git-bisect bisect_reset + $1 messages
  i18n: git-bisect bisect_run + $@ messages
  i18n: git-bisect die + eval_gettext messages
  i18n: git-bisect die + gettext messages
  i18n: git-bisect echo + eval_gettext message
  i18n: git-bisect echo + gettext messages
  i18n: git-bisect gettext + echo message
  i18n: git-bisect add git-sh-i18n
  i18n: git-stash drop_stash say/die messages
  i18n: git-stash "unknown option" message
  i18n: git-stash die + eval_gettext $1 messages
  i18n: git-stash die + eval_gettext $* messages
  i18n: git-stash die + eval_gettext messages
  i18n: git-stash die + gettext messages
  i18n: git-stash say + gettext messages
  i18n: git-stash echo + gettext message
  i18n: git-stash add git-sh-i18n
  ...
---

61f44720a9c360dd30053a558e58c8a41d6f3843
diff --cc git-submodule.sh
index d189a24c7,c1d3a5e2f..c571d320d
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -495,9 -499,9 +499,9 @@@ Maybe you want to use 'update --init'?"
  				# Run fetch only if $sha1 isn't present or it
  				# is not reachable from a ref.
  				(clear_local_git_env; cd "$path" &&
 -					((rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
 +					( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) &&
  					 test -z "$rev") || git-fetch)) ||
- 				die "Unable to fetch in submodule path '$path'"
+ 				die "$(eval_gettext "Unable to fetch in submodule path '\$path'")"
  			fi
  
  			# Is this something we just cloned?