Allow asciidoc formatted documentation in howto/
[git/git.git] / git-merge-one-file-script
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.")
e2b6a9d0 24 echo "Removing $4"
0b124bb4 25 if test -f "$4"; then
aacc15ec
JH
26 rm -f -- "$4"
27 fi &&
0b124bb4 28 exec git-update-cache --remove -- "$4"
ec73962d
PB
29 ;;
30
839a7a06 31#
ee28152d 32# Added in one.
839a7a06 33#
e2b6a9d0 34".$2." | "..$3" )
98a96b00
LT
35 echo "Adding $4"
36 git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
37 exec git-checkout-cache -u -f -- "$4"
ec73962d
PB
38 ;;
39
e2b6a9d0 40#
ee28152d 41# Added in both (check for same permissions).
e2b6a9d0 42#
ee28152d 43".$3$2")
e2b6a9d0 44 if [ "$6" != "$7" ]; then
ee28152d
JH
45 echo "ERROR: File $4 added identically in both branches,"
46 echo "ERROR: but permissions conflict $6->$7."
e2b6a9d0
JB
47 exit 1
48 fi
98a96b00
LT
49 echo "Adding $4"
50 git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
51 exec git-checkout-cache -u -f -- "$4"
ec73962d
PB
52 ;;
53
e3b4be7f 54#
ee28152d 55# Modified in both, but differently.
e3b4be7f
LT
56#
57"$1$2$3")
ee28152d 58 echo "Auto-merging $4."
c7d1d4e1 59 orig=`git-unpack-file $1`
c7d1d4e1 60 src2=`git-unpack-file $3`
ec73962d 61
98a96b00
LT
62 # We reset the index to the first branch, making
63 # git-diff-file useful
0b124bb4 64 git-update-cache --add --cacheinfo "$6" "$2" "$4"
98a96b00
LT
65 git-checkout-cache -u -f -- "$4" &&
66 merge "$4" "$orig" "$src2"
e2b6a9d0 67 ret=$?
98a96b00 68 rm -f -- "$orig" "$src2"
8544a6f1 69
e2b6a9d0 70 if [ "$6" != "$7" ]; then
ec73962d 71 echo "ERROR: Permissions conflict: $5->$6,$7."
2a68a865 72 ret=1
e2b6a9d0 73 fi
8544a6f1 74
e2b6a9d0 75 if [ $ret -ne 0 ]; then
2a68a865 76 echo "ERROR: Merge conflict in $4."
0a9ea850
JB
77 exit 1
78 fi
98a96b00 79 exec git-update-cache -- "$4"
ec73962d
PB
80 ;;
81
e3b4be7f 82*)
ec73962d
PB
83 echo "ERROR: $4: Not handling case $1 -> $2 -> $3"
84 ;;
e3b4be7f
LT
85esac
86exit 1