Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ab/i18n-scripts' into next
author
Junio C Hamano
<gitster@pobox.com>
Thu, 30 Jun 2011 00:09:27 +0000
(17:09 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 30 Jun 2011 00:09:27 +0000
(17:09 -0700)
* 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
...
1
2
git-submodule.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
033c2dc
be508d3
)
diff --cc
git-submodule.sh
index d189a24c71c44806a9c1381e2a8e5993269e568a,c1d3a5e2fafc8137c71b11ccc037603296ed78f3..c571d320d012067fe7c1d4c6248546d0679d0335
---
1
/
git-submodule.sh
---
2
/
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?