]>
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 |
ee28152d JH |
11 | # $5 - orignal file mode (or empty) |
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 |
0fc65a45 | 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 | |
be61db92 JH |
19 | verify_path() { |
20 | file="$1" | |
21 | dir=`dirname "$file"` && | |
22 | mkdir -p "$dir" && | |
23 | rm -f -- "$file" && | |
24 | : >"$file" | |
25 | } | |
26 | ||
e3b4be7f | 27 | case "${1:-.}${2:-.}${3:-.}" in |
839a7a06 | 28 | # |
98a96b00 | 29 | # Deleted in both or deleted in one and unchanged in the other |
839a7a06 | 30 | # |
98a96b00 | 31 | "$1.." | "$1.$1" | "$1$1.") |
cdcb0ed4 LT |
32 | if [ "$2" ]; then |
33 | echo "Removing $4" | |
34 | fi | |
0b124bb4 | 35 | if test -f "$4"; then |
397c7669 | 36 | rm -f -- "$4" && |
ce3ca275 | 37 | rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || : |
aacc15ec | 38 | fi && |
215a7ad1 | 39 | exec git-update-index --remove -- "$4" |
ec73962d PB |
40 | ;; |
41 | ||
839a7a06 | 42 | # |
ee28152d | 43 | # Added in one. |
839a7a06 | 44 | # |
e2b6a9d0 | 45 | ".$2." | "..$3" ) |
98a96b00 | 46 | echo "Adding $4" |
215a7ad1 JH |
47 | git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" && |
48 | exec git-checkout-index -u -f -- "$4" | |
ec73962d PB |
49 | ;; |
50 | ||
e2b6a9d0 | 51 | # |
f7d24bbe | 52 | # Added in both, identically (check for same permissions). |
e2b6a9d0 | 53 | # |
ee28152d | 54 | ".$3$2") |
e2b6a9d0 | 55 | if [ "$6" != "$7" ]; then |
ee28152d JH |
56 | echo "ERROR: File $4 added identically in both branches," |
57 | echo "ERROR: but permissions conflict $6->$7." | |
e2b6a9d0 JB |
58 | exit 1 |
59 | fi | |
98a96b00 | 60 | echo "Adding $4" |
215a7ad1 JH |
61 | git-update-index --add --cacheinfo "$6" "$2" "$4" && |
62 | exec git-checkout-index -u -f -- "$4" | |
ec73962d PB |
63 | ;; |
64 | ||
e3b4be7f | 65 | # |
ee28152d | 66 | # Modified in both, but differently. |
e3b4be7f | 67 | # |
f7d24bbe | 68 | "$1$2$3" | ".$2$3") |
54dd99a1 JH |
69 | |
70 | case ",$6,$7," in | |
71 | *,120000,*) | |
72 | echo "ERROR: $4: Not merging symbolic link changes." | |
73 | exit 1 | |
74 | ;; | |
75 | esac | |
76 | ||
cb93c193 | 77 | src2=`git-unpack-file $3` |
f7d24bbe JH |
78 | case "$1" in |
79 | '') | |
80 | echo "Added $4 in both, but differently." | |
cb93c193 JH |
81 | # This extracts OUR file in $orig, and uses git-apply to |
82 | # remove lines that are unique to ours. | |
f7d24bbe | 83 | orig=`git-unpack-file $2` |
fd66dbf5 | 84 | sz0=`wc -c <"$orig"` |
cb93c193 | 85 | diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add |
fd66dbf5 JH |
86 | sz1=`wc -c <"$orig"` |
87 | ||
88 | # If we do not have enough common material, it is not | |
89 | # worth trying two-file merge using common subsections. | |
90 | expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig | |
f7d24bbe JH |
91 | ;; |
92 | *) | |
93 | echo "Auto-merging $4." | |
94 | orig=`git-unpack-file $1` | |
95 | ;; | |
96 | esac | |
ec73962d | 97 | |
1c2c10b6 JH |
98 | # Create the working tree file, with the correct permission bits. |
99 | # we can not rely on the fact that our tree has the path, because | |
100 | # we allow the merge to be done in an unchecked-out working tree. | |
be61db92 | 101 | verify_path "$4" && |
1c2c10b6 | 102 | git-cat-file blob "$2" >"$4" && |
be61db92 | 103 | case "$6" in *7??) chmod +x -- "$4" ;; esac && |
1c2c10b6 | 104 | merge "$4" "$orig" "$src2" |
e2b6a9d0 | 105 | ret=$? |
98a96b00 | 106 | rm -f -- "$orig" "$src2" |
8544a6f1 | 107 | |
e2b6a9d0 | 108 | if [ "$6" != "$7" ]; then |
ec73962d | 109 | echo "ERROR: Permissions conflict: $5->$6,$7." |
2a68a865 | 110 | ret=1 |
e2b6a9d0 | 111 | fi |
f7d24bbe JH |
112 | if [ "$1" = '' ]; then |
113 | ret=1 | |
114 | fi | |
8544a6f1 | 115 | |
e2b6a9d0 | 116 | if [ $ret -ne 0 ]; then |
2a68a865 | 117 | echo "ERROR: Merge conflict in $4." |
0a9ea850 JB |
118 | exit 1 |
119 | fi | |
215a7ad1 | 120 | exec git-update-index -- "$4" |
ec73962d PB |
121 | ;; |
122 | ||
e3b4be7f | 123 | *) |
ec73962d PB |
124 | echo "ERROR: $4: Not handling case $1 -> $2 -> $3" |
125 | ;; | |
e3b4be7f LT |
126 | esac |
127 | exit 1 |