Do a cross-project merge of Paul Mackerras' gitk visualizer
[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 rm -f -- "$4" &&
26 exec git-update-cache --remove -- "$4"
27 ;;
28
29 #
30 # Added in one.
31 #
32 ".$2." | "..$3" )
33 echo "Adding $4"
34 git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
35 exec git-checkout-cache -u -f -- "$4"
36 ;;
37
38 #
39 # Added in both (check for same permissions).
40 #
41 ".$3$2")
42 if [ "$6" != "$7" ]; then
43 echo "ERROR: File $4 added identically in both branches,"
44 echo "ERROR: but permissions conflict $6->$7."
45 exit 1
46 fi
47 echo "Adding $4"
48 git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
49 exec git-checkout-cache -u -f -- "$4"
50 ;;
51
52 #
53 # Modified in both, but differently.
54 #
55 "$1$2$3")
56 echo "Auto-merging $4."
57 orig=`git-unpack-file $1`
58 src2=`git-unpack-file $3`
59
60 # We reset the index to the first branch, making
61 # git-diff-file useful
62 git-update-cache --add --cacheinfo "$6" "$2" "$4"
63 git-checkout-cache -u -f -- "$4" &&
64 merge "$4" "$orig" "$src2"
65 ret=$?
66 rm -f -- "$orig" "$src2"
67
68 if [ "$6" != "$7" ]; then
69 echo "ERROR: Permissions conflict: $5->$6,$7."
70 ret=1
71 fi
72
73 if [ $ret -ne 0 ]; then
74 echo "ERROR: Merge conflict in $4."
75 exit 1
76 fi
77 exec git-update-cache -- "$4"
78 ;;
79
80 *)
81 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
82 ;;
83 esac
84 exit 1