Merge branch 'jc/makefile'
[git/git.git] / git-merge-one-file.sh
CommitLineData
839a7a06
LT
1#!/bin/sh
2#
ec73962d
PB
3# Copyright (c) Linus Torvalds, 2005
4#
5# This is the git per-file merge script, called with
839a7a06 6#
e3b4be7f
LT
7# $1 - original file SHA1 (or empty)
8# $2 - file in branch1 SHA1 (or empty)
9# $3 - file in branch2 SHA1 (or empty)
839a7a06 10# $4 - pathname in repository
82e5a82f 11# $5 - original file mode (or empty)
ee28152d
JH
12# $6 - file in branch1 mode (or empty)
13# $7 - file in branch2 mode (or empty)
839a7a06 14#
e3b4be7f 15# Handle some trivial cases.. The _really_ trivial cases have
5be60078 16# been handled already by git read-tree, but that one doesn't
ec73962d 17# do any merges that might change the tree layout.
0a9ea850 18
e3b4be7f 19case "${1:-.}${2:-.}${3:-.}" in
839a7a06 20#
98a96b00 21# Deleted in both or deleted in one and unchanged in the other
839a7a06 22#
98a96b00 23"$1.." | "$1.$1" | "$1$1.")
cdcb0ed4
LT
24 if [ "$2" ]; then
25 echo "Removing $4"
ed93b449
JH
26 else
27 # read-tree checked that index matches HEAD already,
28 # so we know we do not have this path tracked.
29 # there may be an unrelated working tree file here,
561b0fbb
JH
30 # which we should just leave unmolested. Make sure
31 # we do not have it in the index, though.
32 exec git update-index --remove -- "$4"
cdcb0ed4 33 fi
0b124bb4 34 if test -f "$4"; then
397c7669 35 rm -f -- "$4" &&
f327dbce 36 rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
aacc15ec 37 fi &&
5be60078 38 exec git update-index --remove -- "$4"
ec73962d
PB
39 ;;
40
839a7a06 41#
ee28152d 42# Added in one.
839a7a06 43#
ed93b449
JH
44".$2.")
45 # the other side did not add and we added so there is nothing
561b0fbb
JH
46 # to be done, except making the path merged.
47 exec git update-index --add --cacheinfo "$6" "$2" "$4"
ed93b449
JH
48 ;;
49"..$3")
98a96b00 50 echo "Adding $4"
ed93b449
JH
51 test -f "$4" || {
52 echo "ERROR: untracked $4 is overwritten by the merge."
53 exit 1
54 }
561b0fbb 55 git update-index --add --cacheinfo "$7" "$3" "$4" &&
5be60078 56 exec git checkout-index -u -f -- "$4"
ec73962d
PB
57 ;;
58
e2b6a9d0 59#
f7d24bbe 60# Added in both, identically (check for same permissions).
e2b6a9d0 61#
ee28152d 62".$3$2")
e2b6a9d0 63 if [ "$6" != "$7" ]; then
ee28152d
JH
64 echo "ERROR: File $4 added identically in both branches,"
65 echo "ERROR: but permissions conflict $6->$7."
e2b6a9d0
JB
66 exit 1
67 fi
98a96b00 68 echo "Adding $4"
5be60078
JH
69 git update-index --add --cacheinfo "$6" "$2" "$4" &&
70 exec git checkout-index -u -f -- "$4"
ec73962d
PB
71 ;;
72
e3b4be7f 73#
ee28152d 74# Modified in both, but differently.
e3b4be7f 75#
f7d24bbe 76"$1$2$3" | ".$2$3")
54dd99a1
JH
77
78 case ",$6,$7," in
79 *,120000,*)
80 echo "ERROR: $4: Not merging symbolic link changes."
81 exit 1
82 ;;
ff72af00
JH
83 *,160000,*)
84 echo "ERROR: $4: Not merging conflicting submodule changes."
85 exit 1
86 ;;
54dd99a1
JH
87 esac
88
cb93c193 89 src2=`git-unpack-file $3`
f7d24bbe
JH
90 case "$1" in
91 '')
92 echo "Added $4 in both, but differently."
5be60078 93 # This extracts OUR file in $orig, and uses git apply to
cb93c193 94 # remove lines that are unique to ours.
f7d24bbe 95 orig=`git-unpack-file $2`
fd66dbf5 96 sz0=`wc -c <"$orig"`
5be60078 97 diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
fd66dbf5
JH
98 sz1=`wc -c <"$orig"`
99
100 # If we do not have enough common material, it is not
101 # worth trying two-file merge using common subsections.
102 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
f7d24bbe
JH
103 ;;
104 *)
31f883d1 105 echo "Auto-merging $4"
f7d24bbe
JH
106 orig=`git-unpack-file $1`
107 ;;
108 esac
ec73962d 109
b539c5e8
JH
110 # Be careful for funny filename such as "-L" in "$4", which
111 # would confuse "merge" greatly.
112 src1=`git-unpack-file $2`
5be60078 113 git merge-file "$src1" "$orig" "$src2"
e2b6a9d0 114 ret=$?
b539c5e8
JH
115
116 # Create the working tree file, using "our tree" version from the
117 # index, and then store the result of the merge.
5be60078 118 git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
b539c5e8 119 rm -f -- "$orig" "$src1" "$src2"
8544a6f1 120
e2b6a9d0 121 if [ "$6" != "$7" ]; then
ec73962d 122 echo "ERROR: Permissions conflict: $5->$6,$7."
2a68a865 123 ret=1
e2b6a9d0 124 fi
f7d24bbe
JH
125 if [ "$1" = '' ]; then
126 ret=1
127 fi
8544a6f1 128
e2b6a9d0 129 if [ $ret -ne 0 ]; then
31f883d1 130 echo "ERROR: Merge conflict in $4"
0a9ea850
JB
131 exit 1
132 fi
5be60078 133 exec git update-index -- "$4"
ec73962d
PB
134 ;;
135
e3b4be7f 136*)
ec73962d
PB
137 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
138 ;;
e3b4be7f
LT
139esac
140exit 1