2005-04-18 19:15:10 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# This is the git merge script, called with
|
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
# $1 - original file SHA1 (or empty)
|
|
|
|
# $2 - file in branch1 SHA1 (or empty)
|
|
|
|
# $3 - file in branch2 SHA1 (or empty)
|
2005-04-18 19:15:10 +00:00
|
|
|
# $4 - pathname in repository
|
|
|
|
#
|
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
# Handle some trivial cases.. The _really_ trivial cases have
|
|
|
|
# been handled already by read-tree, but that one doesn't
|
|
|
|
# do any merges that migth change the tree layout
|
2005-04-18 19:15:10 +00:00
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
|
2005-04-19 02:55:19 +00:00
|
|
|
# if the directory is newly added in a branch, it might not exist
|
|
|
|
# in the current tree
|
|
|
|
dir=$(dirname "$4")
|
|
|
|
mkdir -p "$dir"
|
|
|
|
|
2005-04-18 21:17:58 +00:00
|
|
|
case "${1:-.}${2:-.}${3:-.}" in
|
2005-04-18 19:15:10 +00:00
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
# deleted in both, or deleted in one and unchanged in the other
|
2005-04-18 19:15:10 +00:00
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
"$1.." | "$1.$1" | "$1$1.")
|
|
|
|
rm -f -- "$4"
|
|
|
|
update-cache --remove -- "$4"
|
2005-04-18 19:15:10 +00:00
|
|
|
exit 0
|
2005-04-18 21:17:58 +00:00
|
|
|
;;
|
|
|
|
|
2005-04-18 19:15:10 +00:00
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
# added in one, or added identically in both
|
2005-04-18 19:15:10 +00:00
|
|
|
#
|
2005-04-18 21:17:58 +00:00
|
|
|
".$2." | "..$3" | ".$2$2")
|
|
|
|
mv $(unpack-file "${2:-$3}") $4
|
|
|
|
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)
|
2005-04-19 02:55:19 +00:00
|
|
|
merge "$src2" "$orig" "$src1"
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
echo Leaving conflict merge in $src2
|
|
|
|
exit 1
|
|
|
|
fi
|
2005-04-18 21:17:58 +00:00
|
|
|
cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
echo "Not handling case $1 -> $2 -> $3"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
exit 1
|