mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge-one-file: make sure we create the merged file.

Browse Source 
The "update-index followed by checkout-index" chain served two
purposes -- to collapse the index to "our" version, and make
sure that file exists in the working tree.  In the recent update
to leave the index unmerged on conflicting path, we wanted to
stop doing the former, but we still need to do the latter (we
allow merging to work in an un-checked-out working tree).

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-02 00:50:59 -08:00
parent 57ae0d09ed
commit 1c2c10b6e6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,13 @@ case "${1:-.}${2:-.}${3:-.}" in
;;
esac
merge "$4" "$orig" "$src2"
# Create the working tree file, with the correct permission bits.
# we can not rely on the fact that our tree has the path, because
# we allow the merge to be done in an unchecked-out working tree.
rm -f "$4" &&
git-cat-file blob "$2" >"$4" &&
case "$6" in *7??) chmod +x "$4" ;; esac &&
merge "$4" "$orig" "$src2"
ret=$?
rm -f -- "$orig" "$src2"