Start deprecating "git-command" in favor of "git command"
[git/git.git] / git-merge-one-file.sh
CommitLineData
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
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 19case "${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"
ed93b449
JH
26 else
27 # read-tree checked that index matches HEAD already,
28 # so we know we do not have this path tracked.
29 # there may be an unrelated working tree file here,
30 # which we should just leave unmolested.
31 exit 0
cdcb0ed4 32 fi
0b124bb4 33 if test -f "$4"; then
397c7669 34 rm -f -- "$4" &&
f327dbce 35 rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
aacc15ec 36 fi &&
215a7ad1 37 exec git-update-index --remove -- "$4"
ec73962d
PB
38 ;;
39
839a7a06 40#
ee28152d 41# Added in one.
839a7a06 42#
ed93b449
JH
43".$2.")
44 # the other side did not add and we added so there is nothing
45 # to be done.
46 ;;
47"..$3")
98a96b00 48 echo "Adding $4"
ed93b449
JH
49 test -f "$4" || {
50 echo "ERROR: untracked $4 is overwritten by the merge."
51 exit 1
52 }
215a7ad1
JH
53 git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" &&
54 exec git-checkout-index -u -f -- "$4"
ec73962d
PB
55 ;;
56
e2b6a9d0 57#
f7d24bbe 58# Added in both, identically (check for same permissions).
e2b6a9d0 59#
ee28152d 60".$3$2")
e2b6a9d0 61 if [ "$6" != "$7" ]; then
ee28152d
JH
62 echo "ERROR: File $4 added identically in both branches,"
63 echo "ERROR: but permissions conflict $6->$7."
e2b6a9d0
JB
64 exit 1
65 fi
98a96b00 66 echo "Adding $4"
215a7ad1
JH
67 git-update-index --add --cacheinfo "$6" "$2" "$4" &&
68 exec git-checkout-index -u -f -- "$4"
ec73962d
PB
69 ;;
70
e3b4be7f 71#
ee28152d 72# Modified in both, but differently.
e3b4be7f 73#
f7d24bbe 74"$1$2$3" | ".$2$3")
54dd99a1
JH
75
76 case ",$6,$7," in
77 *,120000,*)
78 echo "ERROR: $4: Not merging symbolic link changes."
79 exit 1
80 ;;
81 esac
82
cb93c193 83 src2=`git-unpack-file $3`
f7d24bbe
JH
84 case "$1" in
85 '')
86 echo "Added $4 in both, but differently."
cb93c193
JH
87 # This extracts OUR file in $orig, and uses git-apply to
88 # remove lines that are unique to ours.
f7d24bbe 89 orig=`git-unpack-file $2`
fd66dbf5 90 sz0=`wc -c <"$orig"`
a6080a0a 91 diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
fd66dbf5
JH
92 sz1=`wc -c <"$orig"`
93
94 # If we do not have enough common material, it is not
95 # worth trying two-file merge using common subsections.
96 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
f7d24bbe
JH
97 ;;
98 *)
31f883d1 99 echo "Auto-merging $4"
f7d24bbe
JH
100 orig=`git-unpack-file $1`
101 ;;
102 esac
ec73962d 103
b539c5e8
JH
104 # Be careful for funny filename such as "-L" in "$4", which
105 # would confuse "merge" greatly.
106 src1=`git-unpack-file $2`
caba139d 107 git-merge-file "$src1" "$orig" "$src2"
e2b6a9d0 108 ret=$?
b539c5e8
JH
109
110 # Create the working tree file, using "our tree" version from the
111 # index, and then store the result of the merge.
112 git-checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
113 rm -f -- "$orig" "$src1" "$src2"
8544a6f1 114
e2b6a9d0 115 if [ "$6" != "$7" ]; then
ec73962d 116 echo "ERROR: Permissions conflict: $5->$6,$7."
2a68a865 117 ret=1
e2b6a9d0 118 fi
f7d24bbe
JH
119 if [ "$1" = '' ]; then
120 ret=1
121 fi
8544a6f1 122
e2b6a9d0 123 if [ $ret -ne 0 ]; then
31f883d1 124 echo "ERROR: Merge conflict in $4"
0a9ea850
JB
125 exit 1
126 fi
215a7ad1 127 exec git-update-index -- "$4"
ec73962d
PB
128 ;;
129
e3b4be7f 130*)
ec73962d
PB
131 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
132 ;;
e3b4be7f
LT
133esac
134exit 1