merge with /dev/null as base, instead of punting O==empty case
[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
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 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
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
JH
59"$1$2$3" | ".$2$3")
60 case "$1" in
61 '')
62 echo "Added $4 in both, but differently."
63 orig=`git-unpack-file $2`
64 : >$orig
65 ;;
66 *)
67 echo "Auto-merging $4."
68 orig=`git-unpack-file $1`
69 ;;
70 esac
c7d1d4e1 71 src2=`git-unpack-file $3`
ec73962d 72
98a96b00
LT
73 # We reset the index to the first branch, making
74 # git-diff-file useful
215a7ad1
JH
75 git-update-index --add --cacheinfo "$6" "$2" "$4"
76 git-checkout-index -u -f -- "$4" &&
98a96b00 77 merge "$4" "$orig" "$src2"
e2b6a9d0 78 ret=$?
98a96b00 79 rm -f -- "$orig" "$src2"
8544a6f1 80
e2b6a9d0 81 if [ "$6" != "$7" ]; then
ec73962d 82 echo "ERROR: Permissions conflict: $5->$6,$7."
2a68a865 83 ret=1
e2b6a9d0 84 fi
f7d24bbe
JH
85 if [ "$1" = '' ]; then
86 ret=1
87 fi
8544a6f1 88
e2b6a9d0 89 if [ $ret -ne 0 ]; then
2a68a865 90 echo "ERROR: Merge conflict in $4."
0a9ea850
JB
91 exit 1
92 fi
215a7ad1 93 exec git-update-index -- "$4"
ec73962d
PB
94 ;;
95
e3b4be7f 96*)
ec73962d
PB
97 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
98 ;;
e3b4be7f
LT
99esac
100exit 1