undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool: Clean up description of files and prompts for merge resolutions

Browse Source 
This fixes complaints from Junio for how messages and prompts are
printed when resolving symlink and deleted file merges.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2007-03-29 11:39:46 -04:00
parent 1346c99963
commit 27090aa1ea
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
git-mergetool.sh
View File

@ -44,25 +44,24 @@ describe_file () {
branch="$2" branch="$2"
file="$3" file="$3"
printf " " printf " {%s}: " "$branch"
if test -z "$mode"; then if test -z "$mode"; then
printf "'%s' was deleted" "$path" echo "deleted"
elif is_symlink "$mode" ; then elif is_symlink "$mode" ; then
printf "'%s' is a symlink containing '%s'" "$path" "$file" echo "a symbolic link -> '$(cat "$file")'"
else else
if base_present; then if base_present; then
printf "'%s' was created" "$path" echo "modified"
else else
printf "'%s' was modified" "$path" echo "created"
fi fi
fi fi
echo " in the $branch branch"
} }
resolve_symlink_merge () { resolve_symlink_merge () {
while true; do while true; do
printf "Use (r)emote or (l)ocal, or (a)bort? " printf "Use (l)ocal or (r)emote, or (a)bort? "
read ans read ans
case "$ans" in case "$ans" in
[lL]*) [lL]*)
@ -86,10 +85,14 @@ resolve_symlink_merge () {
resolve_deleted_merge () { resolve_deleted_merge () {
while true; do while true; do
printf "Use (m)odified or (d)eleted file, or (a)bort? " if base_present; then
printf "Use (m)odified or (d)eleted file, or (a)bort? "
else
printf "Use (c)reated or (d)eleted file, or (a)bort? "
fi
read ans read ans
case "$ans" in case "$ans" in
[mM]*) [mMcC]*)
git-add -- "$path" git-add -- "$path"
cleanup_temp_files --save-backup cleanup_temp_files --save-backup
return return
@ -164,7 +167,7 @@ merge_file () {
remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null
if test -z "$local_mode" -o -z "$remote_mode"; then if test -z "$local_mode" -o -z "$remote_mode"; then
echo "Deleted merge conflict for $path:" echo "Deleted merge conflict for '$path':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
resolve_deleted_merge resolve_deleted_merge
@ -172,14 +175,14 @@ merge_file () {
fi fi
if is_symlink "$local_mode" || is_symlink "$remote_mode"; then if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
echo "Symlink merge conflict for $path:" echo "Symbolic link merge conflict for '$path':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
resolve_symlink_merge resolve_symlink_merge
return return
fi fi
echo "Normal merge conflict for $path:" echo "Normal merge conflict for '$path':"
describe_file "$local_mode" "local" "$LOCAL" describe_file "$local_mode" "local" "$LOCAL"
describe_file "$remote_mode" "remote" "$REMOTE" describe_file "$remote_mode" "remote" "$REMOTE"
printf "Hit return to start merge resolution tool (%s): " "$merge_tool" printf "Hit return to start merge resolution tool (%s): " "$merge_tool"