git-merge-one-file.sh 3.72 KB
Newer Older
1 2
#!/bin/sh
#
3 4 5
# Copyright (c) Linus Torvalds, 2005
#
# This is the git per-file merge script, called with
6
#
7 8 9
#   $1 - original file SHA1 (or empty)
#   $2 - file in branch1 SHA1 (or empty)
#   $3 - file in branch2 SHA1 (or empty)
10
#   $4 - pathname in repository
11
#   $5 - original file mode (or empty)
12 13
#   $6 - file in branch1 mode (or empty)
#   $7 - file in branch2 mode (or empty)
14
#
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.
18

19 20 21 22 23 24 25 26 27 28 29 30
USAGE='<orig blob> <our blob> <their blob> <path>'
USAGE="$USAGE <orig mode> <our mode> <their mode>"
LONG_USAGE="Usage: git merge-one-file $USAGE

Blob ids and modes should be empty for missing files."

if ! test "$#" -eq 7
then
	echo "$LONG_USAGE"
	exit 1
fi

31
case "${1:-.}${2:-.}${3:-.}" in
32
#
33
# Deleted in both or deleted in one and unchanged in the other
34
#
35
"$1.." | "$1.$1" | "$1$1.")
36 37
	if [ "$2" ]; then
		echo "Removing $4"
38 39 40 41
	else
		# read-tree checked that index matches HEAD already,
		# so we know we do not have this path tracked.
		# there may be an unrelated working tree file here,
42 43 44
		# which we should just leave unmolested.  Make sure
		# we do not have it in the index, though.
		exec git update-index --remove -- "$4"
45
	fi
Petr Baudis's avatar
Petr Baudis committed
46
	if test -f "$4"; then
47
		rm -f -- "$4" &&
48
		rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
49
	fi &&
50
		exec git update-index --remove -- "$4"
51 52
	;;

53
#
54
# Added in one.
55
#
56 57
".$2.")
	# the other side did not add and we added so there is nothing
58 59
	# to be done, except making the path merged.
	exec git update-index --add --cacheinfo "$6" "$2" "$4"
60 61
	;;
"..$3")
62
	echo "Adding $4"
63 64
	if test -f "$4"
	then
65 66
		echo "ERROR: untracked $4 is overwritten by the merge."
		exit 1
67
	fi
68
	git update-index --add --cacheinfo "$7" "$3" "$4" &&
69
		exec git checkout-index -u -f -- "$4"
70 71
	;;

72
#
73
# Added in both, identically (check for same permissions).
74
#
75
".$3$2")
76
	if [ "$6" != "$7" ]; then
77 78
		echo "ERROR: File $4 added identically in both branches,"
		echo "ERROR: but permissions conflict $6->$7."
79 80
		exit 1
	fi
81
	echo "Adding $4"
82 83
	git update-index --add --cacheinfo "$6" "$2" "$4" &&
		exec git checkout-index -u -f -- "$4"
84 85
	;;

86
#
87
# Modified in both, but differently.
88
#
89
"$1$2$3" | ".$2$3")
90 91 92 93 94 95

	case ",$6,$7," in
	*,120000,*)
		echo "ERROR: $4: Not merging symbolic link changes."
		exit 1
		;;
96 97 98 99
	*,160000,*)
		echo "ERROR: $4: Not merging conflicting submodule changes."
		exit 1
		;;
100 101
	esac

102
	src2=`git-unpack-file $3`
103 104 105
	case "$1" in
	'')
		echo "Added $4 in both, but differently."
106
		# This extracts OUR file in $orig, and uses git apply to
107
		# remove lines that are unique to ours.
108
		orig=`git-unpack-file $2`
109
		sz0=`wc -c <"$orig"`
110
		diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
111 112 113 114
		sz1=`wc -c <"$orig"`

		# If we do not have enough common material, it is not
		# worth trying two-file merge using common subsections.
115
		expr $sz0 \< $sz1 \* 2 >/dev/null || : >$orig
116 117
		;;
	*)
118
		echo "Auto-merging $4"
119 120 121
		orig=`git-unpack-file $1`
		;;
	esac
122

123 124 125
	# Be careful for funny filename such as "-L" in "$4", which
	# would confuse "merge" greatly.
	src1=`git-unpack-file $2`
126
	git merge-file "$src1" "$orig" "$src2"
127
	ret=$?
128 129 130 131
	msg=
	if [ $ret -ne 0 ]; then
		msg='content conflict'
	fi
132 133 134

	# Create the working tree file, using "our tree" version from the
	# index, and then store the result of the merge.
135
	git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
136
	rm -f -- "$orig" "$src1" "$src2"
137

138
	if [ "$6" != "$7" ]; then
139 140 141 142
		if [ -n "$msg" ]; then
			msg="$msg, "
		fi
		msg="${msg}permissions conflict: $5->$6,$7"
143
		ret=1
144
	fi
145 146 147
	if [ "$1" = '' ]; then
		ret=1
	fi
148

149
	if [ $ret -ne 0 ]; then
150
		echo "ERROR: $msg in $4"
151 152
		exit 1
	fi
153
	exec git update-index -- "$4"
154 155
	;;

156
*)
157 158
	echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
	;;
159 160
esac
exit 1