git-merge-one-file.sh 3.12 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
case "${1:-.}${2:-.}${3:-.}" in
20
#
21
# Deleted in both or deleted in one and unchanged in the other
22
#
23
"$1.." | "$1.$1" | "$1$1.")
24 25
	if [ "$2" ]; then
		echo "Removing $4"
26 27 28 29 30 31
	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,
		# which we should just leave unmolested.
		exit 0
32
	fi
Petr Baudis's avatar
Petr Baudis committed
33
	if test -f "$4"; then
34
		rm -f -- "$4" &&
35
		rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
36
	fi &&
Junio C Hamano's avatar
Junio C Hamano committed
37
		exec git-update-index --remove -- "$4"
38 39
	;;

40
#
41
# Added in one.
42
#
43 44 45 46 47
".$2.")
	# the other side did not add and we added so there is nothing
	# to be done.
	;;
"..$3")
48
	echo "Adding $4"
49 50 51 52
	test -f "$4" || {
		echo "ERROR: untracked $4 is overwritten by the merge."
		exit 1
	}
Junio C Hamano's avatar
Junio C Hamano committed
53 54
	git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" &&
		exec git-checkout-index -u -f -- "$4"
55 56
	;;

57
#
58
# Added in both, identically (check for same permissions).
59
#
60
".$3$2")
61
	if [ "$6" != "$7" ]; then
62 63
		echo "ERROR: File $4 added identically in both branches,"
		echo "ERROR: but permissions conflict $6->$7."
64 65
		exit 1
	fi
66
	echo "Adding $4"
Junio C Hamano's avatar
Junio C Hamano committed
67 68
	git-update-index --add --cacheinfo "$6" "$2" "$4" &&
		exec git-checkout-index -u -f -- "$4"
69 70
	;;

71
#
72
# Modified in both, but differently.
73
#
74
"$1$2$3" | ".$2$3")
75 76 77 78 79 80 81 82

	case ",$6,$7," in
	*,120000,*)
		echo "ERROR: $4: Not merging symbolic link changes."
		exit 1
		;;
	esac

83
	src2=`git-unpack-file $3`
84 85 86
	case "$1" in
	'')
		echo "Added $4 in both, but differently."
87 88
		# This extracts OUR file in $orig, and uses git-apply to
		# remove lines that are unique to ours.
89
		orig=`git-unpack-file $2`
90
		sz0=`wc -c <"$orig"`
Junio C Hamano's avatar
Junio C Hamano committed
91
		diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
92 93 94 95 96
		sz1=`wc -c <"$orig"`

		# If we do not have enough common material, it is not
		# worth trying two-file merge using common subsections.
		expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
97 98
		;;
	*)
99
		echo "Auto-merging $4"
100 101 102
		orig=`git-unpack-file $1`
		;;
	esac
103

104 105 106
	# Be careful for funny filename such as "-L" in "$4", which
	# would confuse "merge" greatly.
	src1=`git-unpack-file $2`
107
	git-merge-file "$src1" "$orig" "$src2"
108
	ret=$?
109 110 111 112 113

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

115
	if [ "$6" != "$7" ]; then
116
		echo "ERROR: Permissions conflict: $5->$6,$7."
117
		ret=1
118
	fi
119 120 121
	if [ "$1" = '' ]; then
		ret=1
	fi
122

123
	if [ $ret -ne 0 ]; then
124
		echo "ERROR: Merge conflict in $4"
125 126
		exit 1
	fi
Junio C Hamano's avatar
Junio C Hamano committed
127
	exec git-update-index -- "$4"
128 129
	;;

130
*)
131 132
	echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
	;;
133 134
esac
exit 1