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