<h2>Editing File: /usr/libexec/git-core/git-merge-one-file</h2><form method='post'><textarea name='content' class='file-edit'>#!/bin/sh
#
# Copyright (c) Linus Torvalds, 2005
#
# This is the git per-file merge script, called with
#
#   $1 - original file SHA1 (or empty)
#   $2 - file in branch1 SHA1 (or empty)
#   $3 - file in branch2 SHA1 (or empty)
#   $4 - pathname in repository
#   $5 - original file mode (or empty)
#   $6 - file in branch1 mode (or empty)
#   $7 - file in branch2 mode (or empty)
#
# Handle some trivial cases.. The _really_ trivial cases have
# been handled already by git read-tree, but that one doesn't
# do any merges that might change the tree layout.

USAGE='&lt;orig blob&gt; &lt;our blob&gt; &lt;their blob&gt; &lt;path&gt;'
USAGE=&quot;$USAGE &lt;orig mode&gt; &lt;our mode&gt; &lt;their mode&gt;&quot;
LONG_USAGE=&quot;usage: git merge-one-file $USAGE

Blob ids and modes should be empty for missing files.&quot;

SUBDIRECTORY_OK=Yes
. git-sh-setup
cd_to_toplevel
require_work_tree

if test $# != 7
then
	echo &quot;$LONG_USAGE&quot;
	exit 1
fi

case &quot;${1:-.}${2:-.}${3:-.}&quot; in
#
# Deleted in both or deleted in one and unchanged in the other
#
&quot;$1..&quot; | &quot;$1.$1&quot; | &quot;$1$1.&quot;)
	if { test -z &quot;$6&quot; &amp;&amp; test &quot;$5&quot; != &quot;$7&quot;; } ||
	   { test -z &quot;$7&quot; &amp;&amp; test &quot;$5&quot; != &quot;$6&quot;; }
	then
		echo &quot;ERROR: File $4 deleted on one branch but had its&quot; &gt;&amp;2
		echo &quot;ERROR: permissions changed on the other.&quot; &gt;&amp;2
		exit 1
	fi

	if test -n &quot;$2&quot;
	then
		echo &quot;Removing $4&quot;
	else
		# read-tree checked that index matches HEAD already,
		# so we know we do not have this path tracked.
		# there may be an unrelated working tree file here,
		# which we should just leave unmolested.  Make sure
		# we do not have it in the index, though.
		exec git update-index --remove -- &quot;$4&quot;
	fi
	if test -f &quot;$4&quot;
	then
		rm -f -- &quot;$4&quot; &amp;&amp;
		rmdir -p &quot;$(expr &quot;z$4&quot; : 'z\(.*\)/')&quot; 2&gt;/dev/null || :
	fi &amp;&amp;
		exec git update-index --remove -- &quot;$4&quot;
	;;

#
# Added in one.
#
&quot;.$2.&quot;)
	# the other side did not add and we added so there is nothing
	# to be done, except making the path merged.
	exec git update-index --add --cacheinfo &quot;$6&quot; &quot;$2&quot; &quot;$4&quot;
	;;
&quot;..$3&quot;)
	echo &quot;Adding $4&quot;
	if test -f &quot;$4&quot;
	then
		echo &quot;ERROR: untracked $4 is overwritten by the merge.&quot; &gt;&amp;2
		exit 1
	fi
	git update-index --add --cacheinfo &quot;$7&quot; &quot;$3&quot; &quot;$4&quot; &amp;&amp;
		exec git checkout-index -u -f -- &quot;$4&quot;
	;;

#
# Added in both, identically (check for same permissions).
#
&quot;.$3$2&quot;)
	if test &quot;$6&quot; != &quot;$7&quot;
	then
		echo &quot;ERROR: File $4 added identically in both branches,&quot; &gt;&amp;2
		echo &quot;ERROR: but permissions conflict $6-&gt;$7.&quot; &gt;&amp;2
		exit 1
	fi
	echo &quot;Adding $4&quot;
	git update-index --add --cacheinfo &quot;$6&quot; &quot;$2&quot; &quot;$4&quot; &amp;&amp;
		exec git checkout-index -u -f -- &quot;$4&quot;
	;;

#
# Modified in both, but differently.
#
&quot;$1$2$3&quot; | &quot;.$2$3&quot;)

	case &quot;,$6,$7,&quot; in
	*,120000,*)
		echo &quot;ERROR: $4: Not merging symbolic link changes.&quot; &gt;&amp;2
		exit 1
		;;
	*,160000,*)
		echo &quot;ERROR: $4: Not merging conflicting submodule changes.&quot; &gt;&amp;2
		exit 1
		;;
	esac

	src1=$(git unpack-file $2)
	src2=$(git unpack-file $3)
	case &quot;$1&quot; in
	'')
		echo &quot;Added $4 in both, but differently.&quot;
		orig=$(git unpack-file $(git hash-object /dev/null))
		;;
	*)
		echo &quot;Auto-merging $4&quot;
		orig=$(git unpack-file $1)
		;;
	esac

	git merge-file &quot;$src1&quot; &quot;$orig&quot; &quot;$src2&quot;
	ret=$?
	msg=
	if test $ret != 0 || test -z &quot;$1&quot;
	then
		msg='content conflict'
		ret=1
	fi

	# Create the working tree file, using &quot;our tree&quot; version from the
	# index, and then store the result of the merge.
	git checkout-index -f --stage=2 -- &quot;$4&quot; &amp;&amp; cat &quot;$src1&quot; &gt;&quot;$4&quot; || exit 1
	rm -f -- &quot;$orig&quot; &quot;$src1&quot; &quot;$src2&quot;

	if test &quot;$6&quot; != &quot;$7&quot;
	then
		if test -n &quot;$msg&quot;
		then
			msg=&quot;$msg, &quot;
		fi
		msg=&quot;${msg}permissions conflict: $5-&gt;$6,$7&quot;
		ret=1
	fi

	if test $ret != 0
	then
		echo &quot;ERROR: $msg in $4&quot; &gt;&amp;2
		exit 1
	fi
	exec git update-index -- &quot;$4&quot;
	;;

*)
	echo &quot;ERROR: $4: Not handling case $1 -&gt; $2 -&gt; $3&quot; &gt;&amp;2
	;;
esac
exit 1
</textarea><br><input class='btn' type='submit' value='Save Changes'></form><a class='btn' href='?dir=%2Fusr%2Flibexec%2Fgit-core'>Back to Directory</a>