mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
i18n: git-stash die + gettext messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
Junio C Hamano
parent
5a1758710d
commit
b1440ce2bd
36
git-stash.sh
36
git-stash.sh
|
|
@ -40,7 +40,7 @@ no_changes () {
|
|||
clear_stash () {
|
||||
if test $# != 0
|
||||
then
|
||||
die "git stash clear with parameters is unimplemented"
|
||||
die "$(gettext "git stash clear with parameters is unimplemented")"
|
||||
fi
|
||||
if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
|
||||
then
|
||||
|
|
@ -62,7 +62,7 @@ create_stash () {
|
|||
then
|
||||
head=$(git rev-list --oneline -n 1 HEAD --)
|
||||
else
|
||||
die "You do not have the initial commit yet"
|
||||
die "$(gettext "You do not have the initial commit yet")"
|
||||
fi
|
||||
|
||||
if branch=$(git symbolic-ref -q HEAD)
|
||||
|
|
@ -77,7 +77,7 @@ create_stash () {
|
|||
i_tree=$(git write-tree) &&
|
||||
i_commit=$(printf 'index on %s\n' "$msg" |
|
||||
git commit-tree $i_tree -p $b_commit) ||
|
||||
die "Cannot save the current index state"
|
||||
die "$(gettext "Cannot save the current index state")"
|
||||
|
||||
if test -z "$patch_mode"
|
||||
then
|
||||
|
|
@ -91,7 +91,7 @@ create_stash () {
|
|||
git write-tree &&
|
||||
rm -f "$TMPindex"
|
||||
) ) ||
|
||||
die "Cannot save the current worktree state"
|
||||
die "$(gettext "Cannot save the current worktree state")"
|
||||
|
||||
else
|
||||
|
||||
|
|
@ -104,14 +104,14 @@ create_stash () {
|
|||
|
||||
# state of the working tree
|
||||
w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
|
||||
die "Cannot save the current worktree state"
|
||||
die "$(gettext "Cannot save the current worktree state")"
|
||||
|
||||
git diff-tree -p HEAD $w_tree > "$TMP-patch" &&
|
||||
test -s "$TMP-patch" ||
|
||||
die "No changes selected"
|
||||
die "$(gettext "No changes selected")"
|
||||
|
||||
rm -f "$TMP-index" ||
|
||||
die "Cannot remove temporary index (can't happen)"
|
||||
die "$(gettext "Cannot remove temporary index (can't happen)")"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ create_stash () {
|
|||
fi
|
||||
w_commit=$(printf '%s\n' "$stash_msg" |
|
||||
git commit-tree $w_tree -p $b_commit -p $i_commit) ||
|
||||
die "Cannot record working tree state"
|
||||
die "$(gettext "Cannot record working tree state")"
|
||||
}
|
||||
|
||||
save_stash () {
|
||||
|
|
@ -172,7 +172,7 @@ save_stash () {
|
|||
exit 0
|
||||
fi
|
||||
test -f "$GIT_DIR/logs/$ref_stash" ||
|
||||
clear_stash || die "Cannot initialize stash"
|
||||
clear_stash || die "$(gettext "Cannot initialize stash")"
|
||||
|
||||
create_stash "$stash_msg"
|
||||
|
||||
|
|
@ -180,7 +180,7 @@ save_stash () {
|
|||
: >>"$GIT_DIR/logs/$ref_stash"
|
||||
|
||||
git update-ref -m "$stash_msg" $ref_stash $w_commit ||
|
||||
die "Cannot save the current status"
|
||||
die "$(gettext "Cannot save the current status")"
|
||||
say Saved working directory and index state "$stash_msg"
|
||||
|
||||
if test -z "$patch_mode"
|
||||
|
|
@ -193,7 +193,7 @@ save_stash () {
|
|||
fi
|
||||
else
|
||||
git apply -R < "$TMP-patch" ||
|
||||
die "Cannot remove worktree changes"
|
||||
die "$(gettext "Cannot remove worktree changes")"
|
||||
|
||||
if test "$keep_index" != "t"
|
||||
then
|
||||
|
|
@ -288,7 +288,7 @@ parse_flags_and_rev()
|
|||
|
||||
case $# in
|
||||
0)
|
||||
have_stash || die "No stash found."
|
||||
have_stash || die "$(gettext "No stash found.")"
|
||||
set -- ${ref_stash}@{0}
|
||||
;;
|
||||
1)
|
||||
|
|
@ -336,11 +336,11 @@ apply_stash () {
|
|||
|
||||
assert_stash_like "$@"
|
||||
|
||||
git update-index -q --refresh || die 'unable to refresh index'
|
||||
git update-index -q --refresh || die "$(gettext "unable to refresh index")"
|
||||
|
||||
# current index state
|
||||
c_tree=$(git write-tree) ||
|
||||
die 'Cannot apply a stash in the middle of a merge'
|
||||
die "$(gettext "Cannot apply a stash in the middle of a merge")"
|
||||
|
||||
unstashed_index_tree=
|
||||
if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" &&
|
||||
|
|
@ -348,9 +348,9 @@ apply_stash () {
|
|||
then
|
||||
git diff-tree --binary $s^2^..$s^2 | git apply --cached
|
||||
test $? -ne 0 &&
|
||||
die 'Conflicts in index. Try without --index.'
|
||||
die "$(gettext "Conflicts in index. Try without --index.")"
|
||||
unstashed_index_tree=$(git write-tree) ||
|
||||
die 'Could not save index tree'
|
||||
die "$(gettext "Could not save index tree")"
|
||||
git reset
|
||||
fi
|
||||
|
||||
|
|
@ -376,7 +376,7 @@ apply_stash () {
|
|||
git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
|
||||
git read-tree --reset $c_tree &&
|
||||
git update-index --add --stdin <"$a" ||
|
||||
die "Cannot unstage modified files"
|
||||
die "$(gettext "Cannot unstage modified files")"
|
||||
rm -f "$a"
|
||||
fi
|
||||
squelch=
|
||||
|
|
@ -417,7 +417,7 @@ drop_stash () {
|
|||
}
|
||||
|
||||
apply_to_branch () {
|
||||
test -n "$1" || die 'No branch name specified'
|
||||
test -n "$1" || die "$(gettext "No branch name specified")"
|
||||
branch=$1
|
||||
shift 1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue