summaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-29 22:02:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-29 22:02:43 (GMT)
commit2d280e1c5e6fdcf5428e60219eae14a2c6629c51 (patch)
tree5703c30797456608d0fcc93fad21b0fbe741015b /git-merge-one-file-script
parentaed7a5a9dab96d1a17be4fadf7685086047178cc (diff)
downloadgit-2d280e1c5e6fdcf5428e60219eae14a2c6629c51.zip
git-2d280e1c5e6fdcf5428e60219eae14a2c6629c51.tar.gz
git-2d280e1c5e6fdcf5428e60219eae14a2c6629c51.tar.bz2
Update the merge scripts for the big git rename.
Let's see what else I forgot..
Diffstat (limited to 'git-merge-one-file-script')
-rwxr-xr-xgit-merge-one-file-script14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 8189253..d00ea9a 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -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
;;
*)