]>
Commit | Line | Data |
---|---|---|
839a7a06 LT |
1 | #!/bin/sh |
2 | # | |
ec73962d PB |
3 | # Copyright (c) Linus Torvalds, 2005 |
4 | # | |
5 | # This is the git per-file merge script, called with | |
839a7a06 | 6 | # |
e3b4be7f LT |
7 | # $1 - original file SHA1 (or empty) |
8 | # $2 - file in branch1 SHA1 (or empty) | |
9 | # $3 - file in branch2 SHA1 (or empty) | |
839a7a06 | 10 | # $4 - pathname in repository |
82e5a82f | 11 | # $5 - original file mode (or empty) |
ee28152d JH |
12 | # $6 - file in branch1 mode (or empty) |
13 | # $7 - file in branch2 mode (or empty) | |
839a7a06 | 14 | # |
e3b4be7f | 15 | # Handle some trivial cases.. The _really_ trivial cases have |
5be60078 | 16 | # been handled already by git read-tree, but that one doesn't |
ec73962d | 17 | # do any merges that might change the tree layout. |
0a9ea850 | 18 | |
ae5bdda3 JN |
19 | USAGE='<orig blob> <our blob> <their blob> <path>' |
20 | USAGE="$USAGE <orig mode> <our mode> <their mode>" | |
e5a1518e | 21 | LONG_USAGE="usage: git merge-one-file $USAGE |
ae5bdda3 JN |
22 | |
23 | Blob ids and modes should be empty for missing files." | |
24 | ||
6aaeca90 JK |
25 | SUBDIRECTORY_OK=Yes |
26 | . git-sh-setup | |
27 | cd_to_toplevel | |
28 | require_work_tree | |
29 | ||
333ea38d | 30 | if test $# != 7 |
ae5bdda3 JN |
31 | then |
32 | echo "$LONG_USAGE" | |
33 | exit 1 | |
34 | fi | |
35 | ||
e3b4be7f | 36 | case "${1:-.}${2:-.}${3:-.}" in |
839a7a06 | 37 | # |
98a96b00 | 38 | # Deleted in both or deleted in one and unchanged in the other |
839a7a06 | 39 | # |
98a96b00 | 40 | "$1.." | "$1.$1" | "$1$1.") |
333ea38d KB |
41 | if test -n "$2" |
42 | then | |
cdcb0ed4 | 43 | echo "Removing $4" |
ed93b449 JH |
44 | else |
45 | # read-tree checked that index matches HEAD already, | |
46 | # so we know we do not have this path tracked. | |
47 | # there may be an unrelated working tree file here, | |
561b0fbb JH |
48 | # which we should just leave unmolested. Make sure |
49 | # we do not have it in the index, though. | |
50 | exec git update-index --remove -- "$4" | |
cdcb0ed4 | 51 | fi |
333ea38d KB |
52 | if test -f "$4" |
53 | then | |
397c7669 | 54 | rm -f -- "$4" && |
f327dbce | 55 | rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || : |
aacc15ec | 56 | fi && |
5be60078 | 57 | exec git update-index --remove -- "$4" |
ec73962d PB |
58 | ;; |
59 | ||
839a7a06 | 60 | # |
ee28152d | 61 | # Added in one. |
839a7a06 | 62 | # |
ed93b449 JH |
63 | ".$2.") |
64 | # the other side did not add and we added so there is nothing | |
561b0fbb JH |
65 | # to be done, except making the path merged. |
66 | exec git update-index --add --cacheinfo "$6" "$2" "$4" | |
ed93b449 JH |
67 | ;; |
68 | "..$3") | |
98a96b00 | 69 | echo "Adding $4" |
29dc1331 JH |
70 | if test -f "$4" |
71 | then | |
d401acf7 | 72 | echo "ERROR: untracked $4 is overwritten by the merge." >&2 |
ed93b449 | 73 | exit 1 |
29dc1331 | 74 | fi |
561b0fbb | 75 | git update-index --add --cacheinfo "$7" "$3" "$4" && |
5be60078 | 76 | exec git checkout-index -u -f -- "$4" |
ec73962d PB |
77 | ;; |
78 | ||
e2b6a9d0 | 79 | # |
f7d24bbe | 80 | # Added in both, identically (check for same permissions). |
e2b6a9d0 | 81 | # |
ee28152d | 82 | ".$3$2") |
333ea38d KB |
83 | if test "$6" != "$7" |
84 | then | |
d401acf7 KB |
85 | echo "ERROR: File $4 added identically in both branches," >&2 |
86 | echo "ERROR: but permissions conflict $6->$7." >&2 | |
e2b6a9d0 JB |
87 | exit 1 |
88 | fi | |
98a96b00 | 89 | echo "Adding $4" |
5be60078 JH |
90 | git update-index --add --cacheinfo "$6" "$2" "$4" && |
91 | exec git checkout-index -u -f -- "$4" | |
ec73962d PB |
92 | ;; |
93 | ||
e3b4be7f | 94 | # |
ee28152d | 95 | # Modified in both, but differently. |
e3b4be7f | 96 | # |
f7d24bbe | 97 | "$1$2$3" | ".$2$3") |
54dd99a1 JH |
98 | |
99 | case ",$6,$7," in | |
100 | *,120000,*) | |
d401acf7 | 101 | echo "ERROR: $4: Not merging symbolic link changes." >&2 |
54dd99a1 JH |
102 | exit 1 |
103 | ;; | |
ff72af00 | 104 | *,160000,*) |
d401acf7 | 105 | echo "ERROR: $4: Not merging conflicting submodule changes." >&2 |
ff72af00 JH |
106 | exit 1 |
107 | ;; | |
54dd99a1 JH |
108 | esac |
109 | ||
4549162e KB |
110 | src1=$(git-unpack-file $2) |
111 | src2=$(git-unpack-file $3) | |
f7d24bbe JH |
112 | case "$1" in |
113 | '') | |
114 | echo "Added $4 in both, but differently." | |
4549162e KB |
115 | orig=$(git-unpack-file $2) |
116 | create_virtual_base "$orig" "$src2" | |
f7d24bbe JH |
117 | ;; |
118 | *) | |
31f883d1 | 119 | echo "Auto-merging $4" |
4549162e | 120 | orig=$(git-unpack-file $1) |
f7d24bbe JH |
121 | ;; |
122 | esac | |
ec73962d | 123 | |
5be60078 | 124 | git merge-file "$src1" "$orig" "$src2" |
e2b6a9d0 | 125 | ret=$? |
718135e3 | 126 | msg= |
4fa5c059 | 127 | if test $ret != 0 || test -z "$1" |
333ea38d | 128 | then |
718135e3 | 129 | msg='content conflict' |
4fa5c059 | 130 | ret=1 |
718135e3 | 131 | fi |
b539c5e8 JH |
132 | |
133 | # Create the working tree file, using "our tree" version from the | |
134 | # index, and then store the result of the merge. | |
6aaeca90 | 135 | git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1 |
b539c5e8 | 136 | rm -f -- "$orig" "$src1" "$src2" |
8544a6f1 | 137 | |
333ea38d KB |
138 | if test "$6" != "$7" |
139 | then | |
140 | if test -n "$msg" | |
141 | then | |
718135e3 AR |
142 | msg="$msg, " |
143 | fi | |
144 | msg="${msg}permissions conflict: $5->$6,$7" | |
2a68a865 | 145 | ret=1 |
e2b6a9d0 | 146 | fi |
8544a6f1 | 147 | |
333ea38d KB |
148 | if test $ret != 0 |
149 | then | |
d401acf7 | 150 | echo "ERROR: $msg in $4" >&2 |
0a9ea850 JB |
151 | exit 1 |
152 | fi | |
5be60078 | 153 | exec git update-index -- "$4" |
ec73962d PB |
154 | ;; |
155 | ||
e3b4be7f | 156 | *) |
d401acf7 | 157 | echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2 |
ec73962d | 158 | ;; |
e3b4be7f LT |
159 | esac |
160 | exit 1 |