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