gitk: Second try to work around the command line limit on Windows
[git/dscho.git] / git-merge-one-file.sh
blobd067894bf45fd0a50513e196ea2a5e671d901681
1 #!/bin/sh
3 # Copyright (c) Linus Torvalds, 2005
5 # This is the git per-file merge script, called with
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 - original file mode (or empty)
12 # $6 - file in branch1 mode (or empty)
13 # $7 - file in branch2 mode (or empty)
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.
19 USAGE='<orig blob> <our blob> <their blob> <path>'
20 USAGE="$USAGE <orig mode> <our mode> <their mode>"
21 LONG_USAGE="Usage: git merge-one-file $USAGE
23 Blob ids and modes should be empty for missing files."
25 if ! test "$#" -eq 7
26 then
27 echo "$LONG_USAGE"
28 exit 1
31 case "${1:-.}${2:-.}${3:-.}" in
33 # Deleted in both or deleted in one and unchanged in the other
35 "$1.." | "$1.$1" | "$1$1.")
36 if [ "$2" ]; then
37 echo "Removing $4"
38 else
39 # read-tree checked that index matches HEAD already,
40 # so we know we do not have this path tracked.
41 # there may be an unrelated working tree file here,
42 # which we should just leave unmolested. Make sure
43 # we do not have it in the index, though.
44 exec git update-index --remove -- "$4"
46 if test -f "$4"; then
47 rm -f -- "$4" &&
48 rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
49 fi &&
50 exec git update-index --remove -- "$4"
54 # Added in one.
56 ".$2.")
57 # the other side did not add and we added so there is nothing
58 # to be done, except making the path merged.
59 exec git update-index --add --cacheinfo "$6" "$2" "$4"
61 "..$3")
62 echo "Adding $4"
63 if test -f "$4"
64 then
65 echo "ERROR: untracked $4 is overwritten by the merge."
66 exit 1
68 git update-index --add --cacheinfo "$7" "$3" "$4" &&
69 exec git checkout-index -u -f -- "$4"
73 # Added in both, identically (check for same permissions).
75 ".$3$2")
76 if [ "$6" != "$7" ]; then
77 echo "ERROR: File $4 added identically in both branches,"
78 echo "ERROR: but permissions conflict $6->$7."
79 exit 1
81 echo "Adding $4"
82 git update-index --add --cacheinfo "$6" "$2" "$4" &&
83 exec git checkout-index -u -f -- "$4"
87 # Modified in both, but differently.
89 "$1$2$3" | ".$2$3")
91 case ",$6,$7," in
92 *,120000,*)
93 echo "ERROR: $4: Not merging symbolic link changes."
94 exit 1
96 *,160000,*)
97 echo "ERROR: $4: Not merging conflicting submodule changes."
98 exit 1
100 esac
102 src2=`git-unpack-file $3`
103 case "$1" in
105 echo "Added $4 in both, but differently."
106 # This extracts OUR file in $orig, and uses git apply to
107 # remove lines that are unique to ours.
108 orig=`git-unpack-file $2`
109 sz0=`wc -c <"$orig"`
110 diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
111 sz1=`wc -c <"$orig"`
113 # If we do not have enough common material, it is not
114 # worth trying two-file merge using common subsections.
115 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
118 echo "Auto-merging $4"
119 orig=`git-unpack-file $1`
121 esac
123 # Be careful for funny filename such as "-L" in "$4", which
124 # would confuse "merge" greatly.
125 src1=`git-unpack-file $2`
126 git merge-file "$src1" "$orig" "$src2"
127 ret=$?
128 msg=
129 if [ $ret -ne 0 ]; then
130 msg='content conflict'
133 # Create the working tree file, using "our tree" version from the
134 # index, and then store the result of the merge.
135 git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
136 rm -f -- "$orig" "$src1" "$src2"
138 if [ "$6" != "$7" ]; then
139 if [ -n "$msg" ]; then
140 msg="$msg, "
142 msg="${msg}permissions conflict: $5->$6,$7"
143 ret=1
145 if [ "$1" = '' ]; then
146 ret=1
149 if [ $ret -ne 0 ]; then
150 echo "ERROR: $msg in $4"
151 exit 1
153 exec git update-index -- "$4"
157 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
159 esac
160 exit 1