add tests for merge-index / merge-one-file
[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
ae5bdda3
JN
19USAGE='<orig blob> <our blob> <their blob> <path>'
20USAGE="$USAGE <orig mode> <our mode> <their mode>"
21LONG_USAGE="Usage: git merge-one-file $USAGE
22
23Blob ids and modes should be empty for missing files."
24
25if ! test "$#" -eq 7
26then
27 echo "$LONG_USAGE"
28 exit 1
29fi
30
e3b4be7f 31case "${1:-.}${2:-.}${3:-.}" in
839a7a06 32#
98a96b00 33# Deleted in both or deleted in one and unchanged in the other
839a7a06 34#
98a96b00 35"$1.." | "$1.$1" | "$1$1.")
cdcb0ed4
LT
36 if [ "$2" ]; then
37 echo "Removing $4"
ed93b449
JH
38 else
39 # read-tree checked that index matches HEAD already,
40 # so we know we do not have this path tracked.
41 # there may be an unrelated working tree file here,
561b0fbb
JH
42 # which we should just leave unmolested. Make sure
43 # we do not have it in the index, though.
44 exec git update-index --remove -- "$4"
cdcb0ed4 45 fi
0b124bb4 46 if test -f "$4"; then
397c7669 47 rm -f -- "$4" &&
f327dbce 48 rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
aacc15ec 49 fi &&
5be60078 50 exec git update-index --remove -- "$4"
ec73962d
PB
51 ;;
52
839a7a06 53#
ee28152d 54# Added in one.
839a7a06 55#
ed93b449
JH
56".$2.")
57 # the other side did not add and we added so there is nothing
561b0fbb
JH
58 # to be done, except making the path merged.
59 exec git update-index --add --cacheinfo "$6" "$2" "$4"
ed93b449
JH
60 ;;
61"..$3")
98a96b00 62 echo "Adding $4"
29dc1331
JH
63 if test -f "$4"
64 then
ed93b449
JH
65 echo "ERROR: untracked $4 is overwritten by the merge."
66 exit 1
29dc1331 67 fi
561b0fbb 68 git update-index --add --cacheinfo "$7" "$3" "$4" &&
5be60078 69 exec git checkout-index -u -f -- "$4"
ec73962d
PB
70 ;;
71
e2b6a9d0 72#
f7d24bbe 73# Added in both, identically (check for same permissions).
e2b6a9d0 74#
ee28152d 75".$3$2")
e2b6a9d0 76 if [ "$6" != "$7" ]; then
ee28152d
JH
77 echo "ERROR: File $4 added identically in both branches,"
78 echo "ERROR: but permissions conflict $6->$7."
e2b6a9d0
JB
79 exit 1
80 fi
98a96b00 81 echo "Adding $4"
5be60078
JH
82 git update-index --add --cacheinfo "$6" "$2" "$4" &&
83 exec git checkout-index -u -f -- "$4"
ec73962d
PB
84 ;;
85
e3b4be7f 86#
ee28152d 87# Modified in both, but differently.
e3b4be7f 88#
f7d24bbe 89"$1$2$3" | ".$2$3")
54dd99a1
JH
90
91 case ",$6,$7," in
92 *,120000,*)
93 echo "ERROR: $4: Not merging symbolic link changes."
94 exit 1
95 ;;
ff72af00
JH
96 *,160000,*)
97 echo "ERROR: $4: Not merging conflicting submodule changes."
98 exit 1
99 ;;
54dd99a1
JH
100 esac
101
cb93c193 102 src2=`git-unpack-file $3`
f7d24bbe
JH
103 case "$1" in
104 '')
105 echo "Added $4 in both, but differently."
5be60078 106 # This extracts OUR file in $orig, and uses git apply to
cb93c193 107 # remove lines that are unique to ours.
f7d24bbe 108 orig=`git-unpack-file $2`
fd66dbf5 109 sz0=`wc -c <"$orig"`
5be60078 110 diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
fd66dbf5
JH
111 sz1=`wc -c <"$orig"`
112
113 # If we do not have enough common material, it is not
114 # worth trying two-file merge using common subsections.
115 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
f7d24bbe
JH
116 ;;
117 *)
31f883d1 118 echo "Auto-merging $4"
f7d24bbe
JH
119 orig=`git-unpack-file $1`
120 ;;
121 esac
ec73962d 122
b539c5e8
JH
123 # Be careful for funny filename such as "-L" in "$4", which
124 # would confuse "merge" greatly.
125 src1=`git-unpack-file $2`
5be60078 126 git merge-file "$src1" "$orig" "$src2"
e2b6a9d0 127 ret=$?
718135e3
AR
128 msg=
129 if [ $ret -ne 0 ]; then
130 msg='content conflict'
131 fi
b539c5e8
JH
132
133 # Create the working tree file, using "our tree" version from the
134 # index, and then store the result of the merge.
5be60078 135 git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
b539c5e8 136 rm -f -- "$orig" "$src1" "$src2"
8544a6f1 137
e2b6a9d0 138 if [ "$6" != "$7" ]; then
718135e3
AR
139 if [ -n "$msg" ]; then
140 msg="$msg, "
141 fi
142 msg="${msg}permissions conflict: $5->$6,$7"
2a68a865 143 ret=1
e2b6a9d0 144 fi
f7d24bbe
JH
145 if [ "$1" = '' ]; then
146 ret=1
147 fi
8544a6f1 148
e2b6a9d0 149 if [ $ret -ne 0 ]; then
718135e3 150 echo "ERROR: $msg in $4"
0a9ea850
JB
151 exit 1
152 fi
5be60078 153 exec git update-index -- "$4"
ec73962d
PB
154 ;;
155
e3b4be7f 156*)
ec73962d
PB
157 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
158 ;;
e3b4be7f
LT
159esac
160exit 1