#!/bin/sh
#
-# This is the git merge script, called with
+# Copyright (c) Linus Torvalds, 2005
+#
+# This is the git per-file merge script, called with
#
# $1 - original file SHA1 (or empty)
# $2 - file in branch1 SHA1 (or empty)
# $3 - file in branch2 SHA1 (or empty)
# $4 - pathname in repository
-#
+# $5 - orignal file mode (or empty)
+# $6 - file in branch1 mode (or empty)
+# $7 - file in branch2 mode (or empty)
#
# 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
-#
-
-# if the directory is newly added in a branch, it might not exist
-# in the current tree
-dir=$(dirname "$4")
-mkdir -p "$dir"
+# been handled already by git-read-tree, but that one doesn't
+# do any merges that might change the tree layout.
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.")
- rm -f -- "$4"
- update-cache --remove -- "$4"
- exit 0
+ echo "Removing $4"
+ if test -f "$4"
+ then
+ rm -f -- "$4"
+ fi &&
+ exec git-update-cache --remove -- "$4"
+ ;;
+
+#
+# Added in one.
+#
+".$2." | "..$3" )
+ echo "Adding $4"
+ git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
+ exec git-checkout-cache -u -f -- "$4"
;;
#
-# added in one, or added identically in both
+# Added in both (check for same permissions).
#
-".$2." | "..$3" | ".$2$2")
- mv $(unpack-file "${2:-$3}") $4
- update-cache --add -- $4
- exit 0
+".$3$2")
+ if [ "$6" != "$7" ]; then
+ echo "ERROR: File $4 added identically in both branches,"
+ echo "ERROR: but permissions conflict $6->$7."
+ exit 1
+ fi
+ echo "Adding $4"
+ git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
+ exec git-checkout-cache -u -f -- "$4"
;;
#
-# Modified in both, but differently ;(
+# Modified in both, but differently.
#
"$1$2$3")
- echo "Auto-merging $4"
- orig=$(unpack-file $1)
- src1=$(unpack-file $2)
- src2=$(unpack-file $3)
- merge "$src2" "$orig" "$src1"
- if [ $? -ne 0 ]; then
- echo Leaving conflict merge in $src2
+ echo "Auto-merging $4."
+ orig=`git-unpack-file $1`
+ src2=`git-unpack-file $3`
+
+ # We reset the index to the first branch, making
+ # git-diff-file useful
+ git-update-cache --add --cacheinfo "$6" "$2" "$4"
+ git-checkout-cache -u -f -- "$4" &&
+ merge "$4" "$orig" "$src2"
+ ret=$?
+ rm -f -- "$orig" "$src2"
+
+ if [ "$6" != "$7" ]; then
+ echo "ERROR: Permissions conflict: $5->$6,$7."
+ ret=1
+ fi
+
+ if [ $ret -ne 0 ]; then
+ echo "ERROR: Merge conflict in $4."
exit 1
fi
- cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
+ exec git-update-cache -- "$4"
;;
*)
- echo "Not handling case $1 -> $2 -> $3"
+ echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
;;
esac
exit 1