undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] SCSI trees, merges and git status

Browse Source 
Doing the latest SCSI merge exposed two bugs in your merge script:

1) It doesn't like a completely new directory (the misc tree contains a
   new drivers/scsi/lpfc)
2) the merge testing logic is wrong.  You only want to exit 1 if the
   merge fails.
This commit is contained in:
James Bottomley 2005-04-18 19:55:19 -07:00 committed by Linus Torvalds
parent b70070f020
commit 0a9ea85000
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,11 @@
# 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"
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
@ -40,7 +45,11 @@ case "${1:-.}${2:-.}${3:-.}" in
orig=$(unpack-file $1) orig=$(unpack-file $1)
src1=$(unpack-file $2) src1=$(unpack-file $2)
src2=$(unpack-file $3) src2=$(unpack-file $3)
merge "$src2" "$orig" "$src1" || echo Leaving conflict merge in $src2 && exit 1 merge "$src2" "$orig" "$src1"
if [ $? -ne 0 ]; then
echo Leaving conflict merge in $src2
exit 1
fi
cp "$src2" "$4" && update-cache --add -- "$4" && exit 0 cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
;; ;;