mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: merge-octopus: mark messages for translation

Browse Source 
Mark messages in git-merge-octopus.sh for translation.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida
2016-06-17 20:20:56 +00:00
committed by Junio C Hamano
parent e8d7c3909d
commit 6a4eb91a73
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-merge-octopus.sh
View File

@ -5,6 +5,8 @@
# Resolve two or more trees. # Resolve two or more trees.
# #
. git-sh-i18n
LF=' LF='
' '
@ -46,7 +48,7 @@ esac
if ! git diff-index --quiet --cached HEAD -- if ! git diff-index --quiet --cached HEAD --
then then
echo "Error: Your local changes to the following files would be overwritten by merge" gettextln "Error: Your local changes to the following files would be overwritten by merge"
git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /' git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /'
exit 2 exit 2
fi fi
@ -61,8 +63,8 @@ do
# We allow only last one to have a hand-resolvable # We allow only last one to have a hand-resolvable
# conflicts. Last round failed and we still had # conflicts. Last round failed and we still had
# a head to merge. # a head to merge.
echo "Automated merge did not work." gettextln "Automated merge did not work."
echo "Should not be doing an Octopus." gettextln "Should not be doing an Octopus."
exit 2 exit 2
esac esac
@ -73,11 +75,11 @@ do
eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name} eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
fi fi
common=$(git merge-base --all $SHA1 $MRC) || common=$(git merge-base --all $SHA1 $MRC) ||
die "Unable to find common commit with $pretty_name" die "$(eval_gettext "Unable to find common commit with \$pretty_name")"
case "$LF$common$LF" in case "$LF$common$LF" in
*"$LF$SHA1$LF"*) *"$LF$SHA1$LF"*)
echo "Already up-to-date with $pretty_name" eval_gettextln "Already up-to-date with \$pretty_name"
continue continue
;; ;;
esac esac
@ -89,7 +91,7 @@ do
# tree as the intermediate result of the merge. # tree as the intermediate result of the merge.
# We still need to count this as part of the parent set. # We still need to count this as part of the parent set.
echo "Fast-forwarding to: $pretty_name" eval_gettextln "Fast-forwarding to: \$pretty_name"
git read-tree -u -m $head $SHA1 || exit git read-tree -u -m $head $SHA1 || exit
MRC=$SHA1 MRT=$(git write-tree) MRC=$SHA1 MRT=$(git write-tree)
continue continue
@ -97,12 +99,12 @@ do
NON_FF_MERGE=1 NON_FF_MERGE=1
echo "Trying simple merge with $pretty_name" eval_gettextln "Trying simple merge with \$pretty_name"
git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2
next=$(git write-tree 2>/dev/null) next=$(git write-tree 2>/dev/null)
if test $? -ne 0 if test $? -ne 0
then then
echo "Simple merge did not work, trying automatic merge." gettextln "Simple merge did not work, trying automatic merge."
git-merge-index -o git-merge-one-file -a || git-merge-index -o git-merge-one-file -a ||
OCTOPUS_FAILURE=1 OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null) next=$(git write-tree 2>/dev/null)