1#!/bin/sh
2#
3# Copyright (c) Linus Torvalds, 2005
4#
5# This is the git per-file merge script, called with
6#
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 - orignal file mode (or empty)
12# $6 - file in branch1 mode (or empty)
13# $7 - file in branch2 mode (or empty)
14#
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.
1819
case "${1:-.}${2:-.}${3:-.}" in
20#
21# Deleted in both.
22#
23"$1..")
24echo "WARNING: $4 is removed in both branches."
25echo "WARNING: This is a potential rename conflict."
26rm -f -- "$4" &&
27exec git-update-cache --remove -- "$4"
28;;
2930
#
31# Deleted in one and unchanged in the other.
32#
33"$1.$1" | "$1$1.")
34echo "Removing $4"
35exec rm -f -- "$4" &&
36git-update-cache --remove -- "$4"
37;;
3839
#
40# Added in one.
41#
42".$2." | "..$3" )
43case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
44echo "Adding $4 with perm $mode."
45exec git-cat-file blob "$2$3" >"$4" &&
46chmod $mode -- "$4" &&
47git-update-cache --add -- "$4"
48;;
4950
#
51# Added in both (check for same permissions).
52#
53".$3$2")
54if [ "$6" != "$7" ]; then
55echo "ERROR: File $4 added identically in both branches,"
56echo "ERROR: but permissions conflict $6->$7."
57exit 1
58fi
59case "$6" in *7??) mode=+x;; *) mode=-x;; esac
60echo "Adding $4 with perm $mode"
61exec git-cat-file blob "$2" >"$4" &&
62chmod $mode -- "$4" &&
63git-update-cache --add -- "$4"
64;;
6566
#
67# Modified in both, but differently.
68#
69"$1$2$3")
70echo "Auto-merging $4."
71orig=`git-unpack-file $1`
72src1=`git-unpack-file $2`
73src2=`git-unpack-file $3`
7475
merge -p "$src1" "$orig" "$src2" > "$4"
76ret=$?
77rm -f -- "$orig" "$src1" "$src2"
7879
if [ "$6" != "$7" ]; then
80echo "ERROR: Permissions conflict: $5->$6,$7."
81ret=1
82fi
83case "$6" in *7??) mode=+x;; *) mode=-x;; esac
84chmod "$mode" "$4"
8586
if [ $ret -ne 0 ]; then
87# Reset the index to the first branch, making
88# git-diff-file useful
89git-update-cache --add --cacheinfo "$6" "$2" "$4"
90echo "ERROR: Merge conflict in $4."
91exit 1
92fi
93exec git-update-cache --add -- "$4"
94;;
9596
*)
97echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
98;;
99esac
100exit 1