3 # Copyright (c) Linus Torvalds, 2005
5 # This is the git per-file merge script, called with
7 # $1 - original file SHA1 (or empty)
8 # $2 - file in branch1 SHA1 (or empty)
9 # $3 - file in branch2 SHA1 (or empty)
10 # $4 - pathname in repository
11 # $5 - orignal file mode (or empty)
12 # $6 - file in branch1 mode (or empty)
13 # $7 - file in branch2 mode (or empty)
15 # Handle some trivial cases.. The _really_ trivial cases have
16 # been handled already by git-read-tree, but that one doesn't
17 # do any merges that might change the tree layout.
21 dir=`dirname "$file"` &&
27 case "${1:-.}${2:-.}${3:-.}" in
29 # Deleted in both or deleted in one and unchanged in the other
31 "$1.." | "$1.$1" | "$1$1.")
37 rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
39 exec git-update-index --remove -- "$4"
47 git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" &&
48 exec git-checkout-index -u -f -- "$4"
52 # Added in both, identically (check for same permissions).
55 if [ "$6" != "$7" ]; then
56 echo "ERROR: File $4 added identically in both branches,"
57 echo "ERROR: but permissions conflict $6->$7."
61 git-update-index --add --cacheinfo "$6" "$2" "$4" &&
62 exec git-checkout-index -u -f -- "$4"
66 # Modified in both, but differently.
72 echo "ERROR: $4: Not merging symbolic link changes."
77 src2=`git-unpack-file $3`
80 echo "Added $4 in both, but differently."
81 # This extracts OUR file in $orig, and uses git-apply to
82 # remove lines that are unique to ours.
83 orig=`git-unpack-file $2`
85 diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
88 # If we do not have enough common material, it is not
89 # worth trying two-file merge using common subsections.
90 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
93 echo "Auto-merging $4."
94 orig=`git-unpack-file $1`
98 # Create the working tree file, with the correct permission bits.
99 # we can not rely on the fact that our tree has the path, because
100 # we allow the merge to be done in an unchecked-out working tree.
102 git-cat-file blob "$2" >"$4" &&
103 case "$6" in *7??) chmod +x -- "$4" ;; esac &&
104 merge "$4" "$orig" "$src2"
106 rm -f -- "$orig" "$src2"
108 if [ "$6" != "$7" ]; then
109 echo "ERROR: Permissions conflict: $5->$6,$7."
112 if [ "$1" = '' ]; then
116 if [ $ret -ne 0 ]; then
117 echo "ERROR: Merge conflict in $4."
120 exec git-update-index -- "$4"
124 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"