mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 17:06:11 +02:00
Code

Update git-merge-one-file-script. 

With this change, git-merge-one-file-script ceases to smudge
files in the work tree when recording the trivial merge results
(conflicting auto-merge failure case does not touch the work
tree file as before).

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-05-01 23:53:32 -07:00
parent 0ff5bf7cfc
commit ee28152d03
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
git-merge-one-file-script
View File

@ -6,81 +6,69 @@
# $2 - file in branch1 SHA1 (or empty) # $2 - file in branch1 SHA1 (or empty)
# $3 - file in branch2 SHA1 (or empty) # $3 - file in branch2 SHA1 (or empty)
# $4 - pathname in repository # $4 - pathname in repository
# # $5 - orignal 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 # Handle some trivial cases.. The _really_ trivial cases have
# been handled already by git-read-tree, but that one doesn't # been handled already by git-read-tree, but that one doesn't
# do any merges that migth change the tree layout # do any merges that migth change the tree layout.
#
# if the directory is newly added in a branch, it might not exist
# in the current tree
dir=$(dirname "$4")
mkdir -p "$dir" || exit
case "${1:-.}${2:-.}${3:-.}" in case "${1:-.}${2:-.}${3:-.}" in
# #
# deleted in both # Deleted in both.
# #
"$1..") "$1..")
echo "ERROR: $4 is removed in both branches" echo "ERROR: $4 is removed in both branches."
echo "ERROR: This is a potential rename conflict" echo "ERROR: This is a potential rename conflict."
exit 1;; exit 1;;
# #
# deleted in one and unchanged in the other # Deleted in one and unchanged in the other.
# #
"$1.." | "$1.$1" | "$1$1.") "$1.." | "$1.$1" | "$1$1.")
echo "Removing $4" echo "Removing $4"
rm -f -- "$4" && exec git-update-cache --remove -- "$4" ;; exec git-update-cache --force-remove "$4" ;;
# #
# added in one # Added in one.
# #
".$2." | "..$3" ) ".$2." | "..$3" )
case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
echo "Adding $4 with perm $mode" echo "Adding $4 with perm $mode."
rm -f -- "$4" && exec git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" ;;
git-cat-file blob "$2$3" >"$4" &&
chmod "$mode" -- "$4" &&
exec git-update-cache --add -- "$4" ;;
# #
# Added in both (check for same permissions) # Added in both (check for same permissions).
# #
".$2$2") ".$3$2")
if [ "$6" != "$7" ]; then if [ "$6" != "$7" ]; then
echo "ERROR: File $4 added in both branches, permissions conflict $6->$7" echo "ERROR: File $4 added identically in both branches,"
echo "ERROR: but permissions conflict $6->$7."
exit 1 exit 1
fi fi
case "$6" in *7??) mode=+x;; *) mode=-x;; esac case "$6" in *7??) mode=+x;; *) mode=-x;; esac
echo "Adding $4 with perm $mode" echo "Adding $4 with perm $mode"
rm -f -- "$4" && exec git-update-cache --add --cacheinfo "$6" "$2" "$4" ;;
git-cat-file blob "$2" >"$4" &&
chmod "$mode" -- "$4" &&
exec git-update-cache --add -- "$4" ;;
# #
# Modified in both, but differently ;( # Modified in both, but differently.
# #
"$1$2$3") "$1$2$3")
echo "Auto-merging $4" echo "Auto-merging $4."
orig=$(git-unpack-file $1) orig=$(git-unpack-file $1)
src1=$(git-unpack-file $2) src1=$(git-unpack-file $2)
src2=$(git-unpack-file $3) src2=$(git-unpack-file $3)
merge "$src2" "$orig" "$src1" merge "$src2" "$orig" "$src1"
ret=$? ret=$?
if [ "$6" != "$7" ]; then if [ "$6" != "$7" ]; then
echo "ERROR: Permissions $5->$6->$7 don't match merging $src2" echo "ERROR: Permissions $5->$6->$7 don't match."
if [ $ret -ne 0 ]; then
echo "ERROR: Leaving conflict merge in $src2"
fi
exit 1
fi fi
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
echo "ERROR: Leaving conflict merge in $src2" echo "ERROR: Leaving conflict merge in $src2."
exit 1 exit 1
fi fi
case "$6" in *7??) mode=+x;; *) mode=-x;; esac sha1=$(git-write-blob "$src2") || {
rm -f -- "$4" && cat "$src2" >"$4" && chmod "$mode" -- "$4" && echo "ERROR: Leaving conflict merge in $src2."
exec git-update-cache --add -- "$4" ;; }
exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;
*) *)
echo "Not handling case $4: $1 -> $2 -> $3" ;; echo "ERROR: Not handling case $4: $1 -> $2 -> $3" ;;
esac esac
exit 1 exit 1