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

[PATCH] Fix git-merge-one-file permissions auto-merging

Browse Source 
In the automerge case, permissions were not restored properly after the
merge tool was invoked and overwrote the target file.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Petr Baudis 2005-06-08 23:26:55 +02:00 committed by Linus Torvalds
parent 7f1d112962
commit 8544a6f1b8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,10 +63,14 @@ case "${1:-.}${2:-.}${3:-.}" in
merge -p "$src1" "$orig" "$src2" > "$4"
ret=$?
rm -f -- "$orig" "$src1" "$src2"
if [ "$6" != "$7" ]; then
echo "ERROR: Permissions $5->$6->$7 don't match."
ret=1
fi
case "$6" in *7??) mode=+x;; *) mode=-x;; esac
chmod "$mode" "$4"
if [ $ret -ne 0 ]; then
# Reset the index to the first branch, making
# git-diff-file useful