blob: cefbe634d888e33c8baba485517c32ad418ae142 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
#!/bin/sh
#
# This is the git merge script, called with
#
# $1 - original file SHA1 (or empty)
# $2 - file in branch1 SHA1 (or empty)
# $3 - file in branch2 SHA1 (or empty)
# $4 - pathname in repository
#
#
# Handle some trivial cases.. The _really_ trivial cases have
# been handled already by git-read-tree, but that one doesn't
# do any merges that migth change the tree layout
#
# if the directory is newly added in a branch, it might not exist
# in the current tree
dir=$(dirname "$4")
mkdir -p "$dir" || exit
case "${1:-.}${2:-.}${3:-.}" in
#
# deleted in both
#
"$1..")
echo "ERROR: $4 is removed in both branches"
echo "ERROR: This is a potential rename conflict"
exit 1;;
#
# deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
rm -f -- "$4" && exec git-update-cache --remove -- "$4" ;;
#
# added in one
#
".$2." | "..$3" )
case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
echo "Adding $4 with perm $mode"
rm -f -- "$4" &&
git-cat-file blob "$2$3" >"$4" &&
chmod "$mode" -- "$4" &&
exec git-update-cache --add -- "$4" ;;
#
# Added in both (check for same permissions)
#
".$2$2")
if [ "$6" != "$7" ]; then
echo "ERROR: File $4 added in both branches, permissions conflict $6->$7"
exit 1
fi
case "$6" in *7??) mode=+x;; *) mode=-x;; esac
echo "Adding $4 with perm $mode"
rm -f -- "$4" &&
git-cat-file blob "$2" >"$4" &&
chmod "$mode" -- "$4" &&
exec git-update-cache --add -- "$4" ;;
#
# Modified in both, but differently ;(
#
"$1$2$3")
echo "Auto-merging $4"
orig=$(git-unpack-file $1)
src1=$(git-unpack-file $2)
src2=$(git-unpack-file $3)
merge "$src2" "$orig" "$src1"
ret=$?
if [ "$6" != "$7" ]; then
echo "ERROR: Permissions $5->$6->$7 don't match merging $src2"
if [ $ret -ne 0 ]; then
echo "ERROR: Leaving conflict merge in $src2"
fi
exit 1
fi
if [ $ret -ne 0 ]; then
echo "ERROR: Leaving conflict merge in $src2"
exit 1
fi
case "$6" in *7??) mode=+x;; *) mode=-x;; esac
rm -f -- "$4" && cat "$src2" >"$4" && chmod "$mode" -- "$4" &&
exec git-update-cache --add -- "$4" ;;
*)
echo "Not handling case $4: $1 -> $2 -> $3" ;;
esac
exit 1
|
