kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-merge-one: new merge world order. 

This does two things:

 - Use new --stage=2 option to create the working tree file with
   leading paths and correct permission bits using
   checkout-index, as before.

 - Make sure we do not confuse "merge" program when the file
   being merged has an unfortunate name, '-L'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2005-12-07 00:50:33 -08:00
parent 3bd348aeea
commit b539c5e8fb
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
git-merge-one-file.sh
View File

@ -16,14 +16,6 @@
# 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 might change the tree layout. # do any merges that might change the tree layout.


verify_path() {
file="$1"
dir=`dirname "$file"` &&
mkdir -p "$dir" &&
rm -f -- "$file" &&
: >"$file"
}

case "${1:-.}${2:-.}${3:-.}" in case "${1:-.}${2:-.}${3:-.}" in
# #
# Deleted in both or deleted in one and unchanged in the other # Deleted in both or deleted in one and unchanged in the other
@ -95,15 +87,16 @@ case "${1:-.}${2:-.}${3:-.}" in
;; ;;
esac esac


# Create the working tree file, with the correct permission bits. # Be careful for funny filename such as "-L" in "$4", which
# we can not rely on the fact that our tree has the path, because # would confuse "merge" greatly.
# we allow the merge to be done in an unchecked-out working tree. src1=`git-unpack-file $2`
verify_path "$4" && merge "$src1" "$orig" "$src2"
git-cat-file blob "$2" >"$4" &&
case "$6" in *7??) chmod +x -- "$4" ;; esac &&
merge "$4" "$orig" "$src2"
ret=$? ret=$?
rm -f -- "$orig" "$src2"
# Create the working tree file, using "our tree" version from the
# index, and then store the result of the merge.
git-checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
rm -f -- "$orig" "$src1" "$src2"


if [ "$6" != "$7" ]; then if [ "$6" != "$7" ]; then
echo "ERROR: Permissions conflict: $5->$6,$7." echo "ERROR: Permissions conflict: $5->$6,$7."