9802f67032bde6bbd9edacb89f3a4acdf876deb9
[git/git.git] / git-merge-one-file-script
1 #!/bin/sh
2 #
3 # Copyright (c) Linus Torvalds, 2005
4 #
5 # This is the git per-file merge script, called with
6 #
7 # $1 - original file SHA1 (or empty)
8 # $2 - file in branch1 SHA1 (or empty)
9 # $3 - file in branch2 SHA1 (or empty)
10 # $4 - pathname in repository
11 # $5 - orignal file mode (or empty)
12 # $6 - file in branch1 mode (or empty)
13 # $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 echo "Removing $4"
25 if test -f "$4"
26 then
27 rm -f -- "$4"
28 fi &&
29 exec git-update-cache --remove -- "$4"
30 ;;
31
32 #
33 # Added in one.
34 #
35 ".$2." | "..$3" )
36 echo "Adding $4"
37 git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
38 exec git-checkout-cache -u -f -- "$4"
39 ;;
40
41 #
42 # Added in both (check for same permissions).
43 #
44 ".$3$2")
45 if [ "$6" != "$7" ]; then
46 echo "ERROR: File $4 added identically in both branches,"
47 echo "ERROR: but permissions conflict $6->$7."
48 exit 1
49 fi
50 echo "Adding $4"
51 git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
52 exec git-checkout-cache -u -f -- "$4"
53 ;;
54
55 #
56 # Modified in both, but differently.
57 #
58 "$1$2$3")
59 echo "Auto-merging $4."
60 orig=`git-unpack-file $1`
61 src2=`git-unpack-file $3`
62
63 # We reset the index to the first branch, making
64 # git-diff-file useful
65 git-update-cache --add --cacheinfo "$6" "$2" "$4"
66 git-checkout-cache -u -f -- "$4" &&
67 merge "$4" "$orig" "$src2"
68 ret=$?
69 rm -f -- "$orig" "$src2"
70
71 if [ "$6" != "$7" ]; then
72 echo "ERROR: Permissions conflict: $5->$6,$7."
73 ret=1
74 fi
75
76 if [ $ret -ne 0 ]; then
77 echo "ERROR: Merge conflict in $4."
78 exit 1
79 fi
80 exec git-update-cache -- "$4"
81 ;;
82
83 *)
84 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
85 ;;
86 esac
87 exit 1