#!/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
+# Deleted in both.
#
"$1..")
- echo "ERROR: $4 is removed in both branches"
- echo "ERROR: This is a potential rename conflict"
- exit 1;;
+ echo "WARNING: $4 is removed in both branches."
+ echo "WARNING: This is a potential rename conflict."
+ rm -f -- "$4" &&
+ exec git-update-cache --remove -- "$4"
+ ;;
+
#
-# deleted in one and unchanged in the other
+# Deleted in one and unchanged in the other.
#
-"$1.." | "$1.$1" | "$1$1.")
- rm -f -- "$4"
+"$1.$1" | "$1$1.")
echo "Removing $4"
- update-cache --remove -- "$4"
- exit 0
+ exec rm -f -- "$4" &&
+ git-update-cache --remove -- "$4"
;;
#
-# added in one
+# Added in one.
#
".$2." | "..$3" )
- echo "Adding $4 with perm $6$7"
- mv $(unpack-file "$2$3") $4
- chmod "$6$7" $4
- update-cache --add -- $4
- exit 0
+ case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
+ echo "Adding $4 with perm $mode."
+ exec git-cat-file blob "$2$3" >"$4" &&
+ chmod $mode -- "$4" &&
+ git-update-cache --add -- "$4"
;;
+
#
-# Added in both (check for same permissions)
+# Added in both (check for same permissions).
#
-".$2$2")
+".$3$2")
if [ "$6" != "$7" ]; then
- echo "ERROR: File $4 added in both branches, permissions conflict $6->$7"
+ echo "ERROR: File $4 added identically in both branches,"
+ echo "ERROR: but permissions conflict $6->$7."
exit 1
fi
- echo "Adding $4 with perm $6"
- mv $(unpack-file "$2") $4
- chmod "$6" $4
- update-cache --add -- $4
- exit 0;;
+ case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+ echo "Adding $4 with perm $mode"
+ exec git-cat-file blob "$2" >"$4" &&
+ chmod $mode -- "$4" &&
+ git-update-cache --add -- "$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"
+ echo "Auto-merging $4."
+ orig=`git-unpack-file $1`
+ src1=`git-unpack-file $2`
+ src2=`git-unpack-file $3`
+
+ merge -p "$src1" "$orig" "$src2" > "$4"
ret=$?
+ rm -f -- "$orig" "$src1" "$src2"
+
if [ "$6" != "$7" ]; then
- echo "ERROR: Permissions $5->$6->$7 don't match merging $src2"
- if [ $ret -ne 0 ]; then
- echo "ERROR: Leaving conflict merge in $src2"
- fi
- exit 1
+ echo "ERROR: Permissions conflict: $5->$6,$7."
+ ret=1
fi
- chmod -- "$6" "$src2"
+ case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+ chmod "$mode" "$4"
+
if [ $ret -ne 0 ]; then
- echo "ERROR: Leaving conflict merge in $src2"
+ # Reset the index to the first branch, making
+ # git-diff-file useful
+ git-update-cache --add --cacheinfo "$6" "$2" "$4"
+ echo "ERROR: Merge conflict in $4."
exit 1
fi
- cp -- "$src2" "$4" && chmod -- "$6" "$4" && update-cache --add -- "$4" && exit 0
+ exec git-update-cache --add -- "$4"
;;
*)
- echo "Not handling case $1 -> $2 -> $3"
+ echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
;;
esac
exit 1