]>
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 | |
e3b4be7f | 19 | case "${1:-.}${2:-.}${3:-.}" in |
839a7a06 | 20 | # |
98a96b00 | 21 | # Deleted in both or deleted in one and unchanged in the other |
839a7a06 | 22 | # |
98a96b00 | 23 | "$1.." | "$1.$1" | "$1$1.") |
cdcb0ed4 LT |
24 | if [ "$2" ]; then |
25 | echo "Removing $4" | |
26 | fi | |
0b124bb4 | 27 | if test -f "$4"; then |
aacc15ec JH |
28 | rm -f -- "$4" |
29 | fi && | |
215a7ad1 | 30 | exec git-update-index --remove -- "$4" |
ec73962d PB |
31 | ;; |
32 | ||
839a7a06 | 33 | # |
ee28152d | 34 | # Added in one. |
839a7a06 | 35 | # |
e2b6a9d0 | 36 | ".$2." | "..$3" ) |
98a96b00 | 37 | echo "Adding $4" |
215a7ad1 JH |
38 | git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" && |
39 | exec git-checkout-index -u -f -- "$4" | |
ec73962d PB |
40 | ;; |
41 | ||
e2b6a9d0 | 42 | # |
f7d24bbe | 43 | # Added in both, identically (check for same permissions). |
e2b6a9d0 | 44 | # |
ee28152d | 45 | ".$3$2") |
e2b6a9d0 | 46 | if [ "$6" != "$7" ]; then |
ee28152d JH |
47 | echo "ERROR: File $4 added identically in both branches," |
48 | echo "ERROR: but permissions conflict $6->$7." | |
e2b6a9d0 JB |
49 | exit 1 |
50 | fi | |
98a96b00 | 51 | echo "Adding $4" |
215a7ad1 JH |
52 | git-update-index --add --cacheinfo "$6" "$2" "$4" && |
53 | exec git-checkout-index -u -f -- "$4" | |
ec73962d PB |
54 | ;; |
55 | ||
e3b4be7f | 56 | # |
ee28152d | 57 | # Modified in both, but differently. |
e3b4be7f | 58 | # |
f7d24bbe | 59 | "$1$2$3" | ".$2$3") |
cb93c193 | 60 | src2=`git-unpack-file $3` |
f7d24bbe JH |
61 | case "$1" in |
62 | '') | |
63 | echo "Added $4 in both, but differently." | |
cb93c193 JH |
64 | # This extracts OUR file in $orig, and uses git-apply to |
65 | # remove lines that are unique to ours. | |
f7d24bbe | 66 | orig=`git-unpack-file $2` |
cb93c193 | 67 | diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add |
f7d24bbe JH |
68 | ;; |
69 | *) | |
70 | echo "Auto-merging $4." | |
71 | orig=`git-unpack-file $1` | |
72 | ;; | |
73 | esac | |
ec73962d | 74 | |
98a96b00 LT |
75 | # We reset the index to the first branch, making |
76 | # git-diff-file useful | |
215a7ad1 JH |
77 | git-update-index --add --cacheinfo "$6" "$2" "$4" |
78 | git-checkout-index -u -f -- "$4" && | |
98a96b00 | 79 | merge "$4" "$orig" "$src2" |
e2b6a9d0 | 80 | ret=$? |
98a96b00 | 81 | rm -f -- "$orig" "$src2" |
8544a6f1 | 82 | |
e2b6a9d0 | 83 | if [ "$6" != "$7" ]; then |
ec73962d | 84 | echo "ERROR: Permissions conflict: $5->$6,$7." |
2a68a865 | 85 | ret=1 |
e2b6a9d0 | 86 | fi |
f7d24bbe JH |
87 | if [ "$1" = '' ]; then |
88 | ret=1 | |
89 | fi | |
8544a6f1 | 90 | |
e2b6a9d0 | 91 | if [ $ret -ne 0 ]; then |
2a68a865 | 92 | echo "ERROR: Merge conflict in $4." |
0a9ea850 JB |
93 | exit 1 |
94 | fi | |
215a7ad1 | 95 | exec git-update-index -- "$4" |
ec73962d PB |
96 | ;; |
97 | ||
e3b4be7f | 98 | *) |
ec73962d PB |
99 | echo "ERROR: $4: Not handling case $1 -> $2 -> $3" |
100 | ;; | |
e3b4be7f LT |
101 | esac |
102 | exit 1 |