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

git-merge-one-file: style cleanup

Browse Source 
Update style to match Documentation/CodingGuidelines.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Bracey 2013-03-24 14:26:23 +02:00 committed by Junio C Hamano
parent 530333cfe8
commit 333ea38db9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
git-merge-one-file.sh
View File

@ -27,7 +27,7 @@ SUBDIRECTORY_OK=Yes
cd_to_toplevel cd_to_toplevel
require_work_tree require_work_tree
if ! test "$#" -eq 7 if test $# != 7
then then
echo "$LONG_USAGE" echo "$LONG_USAGE"
exit 1 exit 1
@ -38,7 +38,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# Deleted in both or deleted in one and unchanged in the other # Deleted in both or deleted in one and unchanged in the other
# #
"$1.." | "$1.$1" | "$1$1.") "$1.." | "$1.$1" | "$1$1.")
if [ "$2" ]; then if test -n "$2"
then
echo "Removing $4" echo "Removing $4"
else else
# read-tree checked that index matches HEAD already, # read-tree checked that index matches HEAD already,
@ -48,7 +49,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# we do not have it in the index, though. # we do not have it in the index, though.
exec git update-index --remove -- "$4" exec git update-index --remove -- "$4"
fi fi
if test -f "$4"; then if test -f "$4"
then
rm -f -- "$4" && rm -f -- "$4" &&
rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || : rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
fi && fi &&
@ -78,7 +80,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# Added in both, identically (check for same permissions). # Added in both, identically (check for same permissions).
# #
".$3$2") ".$3$2")
if [ "$6" != "$7" ]; then if test "$6" != "$7"
then
echo "ERROR: File $4 added identically in both branches," echo "ERROR: File $4 added identically in both branches,"
echo "ERROR: but permissions conflict $6->$7." echo "ERROR: but permissions conflict $6->$7."
exit 1 exit 1
@ -121,7 +124,8 @@ case "${1:-.}${2:-.}${3:-.}" in
git merge-file "$src1" "$orig" "$src2" git merge-file "$src1" "$orig" "$src2"
ret=$? ret=$?
msg= msg=
if [ $ret -ne 0 ]; then if test $ret != 0
then
msg='content conflict' msg='content conflict'
fi fi
@ -130,18 +134,22 @@ case "${1:-.}${2:-.}${3:-.}" in
git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1 git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1
rm -f -- "$orig" "$src1" "$src2" rm -f -- "$orig" "$src1" "$src2"
if [ "$6" != "$7" ]; then if test "$6" != "$7"
if [ -n "$msg" ]; then then
if test -n "$msg"
then
msg="$msg, " msg="$msg, "
fi fi
msg="${msg}permissions conflict: $5->$6,$7" msg="${msg}permissions conflict: $5->$6,$7"
ret=1 ret=1
fi fi
if [ "$1" = '' ]; then if test -z "$1"
then
ret=1 ret=1
fi fi
if [ $ret -ne 0 ]; then if test $ret != 0
then
echo "ERROR: $msg in $4" echo "ERROR: $msg in $4"
exit 1 exit 1
fi fi