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

Update the merge scripts for the big git rename.

Browse Source 
Let's see what else I forgot..
This commit is contained in:
Linus Torvalds
2005-04-29 15:02:43 -07:00
parent aed7a5a9da
commit 2d280e1c5e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
git-merge-one-file-script
View File

@ -32,7 +32,7 @@ case "${1:-.}${2:-.}${3:-.}" in
"$1.." | "$1.$1" | "$1$1.")
rm -f -- "$4"
echo "Removing $4"
update-cache --remove -- "$4"
git-update-cache --remove -- "$4"
exit 0
;;
@ -43,7 +43,7 @@ case "${1:-.}${2:-.}${3:-.}" in
echo "Adding $4 with perm $6$7"
mv $(unpack-file "$2$3") $4
chmod "$6$7" $4
update-cache --add -- $4
git-update-cache --add -- $4
exit 0
;;
#
@ -57,16 +57,16 @@ case "${1:-.}${2:-.}${3:-.}" in
echo "Adding $4 with perm $6"
mv $(unpack-file "$2") $4
chmod "$6" $4
update-cache --add -- $4
git-update-cache --add -- $4
exit 0;;
#
# Modified in both, but differently ;(
#
"$1$2$3")
echo "Auto-merging $4"
orig=$(unpack-file $1)
src1=$(unpack-file $2)
src2=$(unpack-file $3)
orig=$(git-unpack-file $1)
src1=$(git-unpack-file $2)
src2=$(git-unpack-file $3)
merge "$src2" "$orig" "$src1"
ret=$?
if [ "$6" != "$7" ]; then
@ -81,7 +81,7 @@ case "${1:-.}${2:-.}${3:-.}" in
echo "ERROR: Leaving conflict merge in $src2"
exit 1
fi
cp -- "$src2" "$4" && chmod -- "$6" "$4" && update-cache --add -- "$4" && exit 0
cp -- "$src2" "$4" && chmod -- "$6" "$4" && git-update-cache --add -- "$4" && exit 0
;;
*)