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

Use merge-recursive in git-checkout -m (branch switching)

Browse Source 
This allows "git checkout -m <other-branch>" to notice renames and
carry local changes in the working tree forward.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-16 20:46:39 -08:00
parent 7905ba626e
commit c1a4278ee3
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-checkout.sh
View File

@ -201,8 +201,9 @@ else
git diff-files --name-only | git update-index --remove --stdin && git diff-files --name-only | git update-index --remove --stdin &&
work=`git write-tree` && work=`git write-tree` &&
git read-tree --reset -u $new && git read-tree --reset -u $new &&
git read-tree -m -u --aggressive --exclude-per-directory=.gitignore $old $new $work || eval GITHEAD_$new=${new_name:-${branch:-$new}} GITHEAD_$work=local &&
exit export GITHEAD_$new GITHEAD_$work &&
git merge-recursive $old -- $new $work || exit
if result=`git write-tree 2>/dev/null` if result=`git write-tree 2>/dev/null`
then then

41
t/t7201-co.sh
View File

@ -14,15 +14,23 @@ fill () {
done done
} }
test_expect_success setup ' test_expect_success setup '
fill 1 2 3 4 5 >one && fill 1 2 3 4 5 6 7 8 >one &&
fill a b c d e >two && fill a b c d e >two &&
git add one two && git add one two &&
git commit -m "Initial A one, A two" && git commit -m "Initial A one, A two" &&
git checkout -b side && git checkout -b renamer &&
fill 1 2 3 >one && rm -f one &&
fill 1 3 4 5 6 7 8 >uno &&
git add uno &&
fill a b c d e f >two &&
git commit -a -m "Renamer R one->uno, M two" &&
git checkout -b side master &&
fill 1 2 3 4 5 6 7 >one &&
fill A B C D E >three && fill A B C D E >three &&
rm -f two && rm -f two &&
git update-index --add --remove one two three && git update-index --add --remove one two three &&
@ -42,7 +50,7 @@ test_expect_success "checkout from non-existing branch" '
test_expect_success "checkout with dirty tree without -m" ' test_expect_success "checkout with dirty tree without -m" '
fill 0 1 2 3 4 5 >one && fill 0 1 2 3 4 5 6 7 8 >one &&
if git checkout side if git checkout side
then then
echo Not happy echo Not happy
@ -58,12 +66,10 @@ test_expect_success "checkout -m with dirty tree" '
git checkout -f master && git checkout -f master &&
git clean && git clean &&
fill 0 1 2 3 4 5 >one && fill 0 1 2 3 4 5 6 7 8 >one &&
git checkout -m side && git checkout -m side &&
fill " master" "* side" >expect.branch && test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
git branch >current.branch &&
diff expect.branch current.branch &&
fill "M one" "A three" "D two" >expect.master && fill "M one" "A three" "D two" >expect.master &&
git diff --name-status master >current.master && git diff --name-status master >current.master &&
@ -78,4 +84,23 @@ test_expect_success "checkout -m with dirty tree" '
diff expect.index current.index diff expect.index current.index
' '
test_expect_success "checkout -m with dirty tree, renamed" '
git checkout -f master && git clean &&
fill 1 2 3 4 5 7 8 >one &&
if git checkout renamer
then
echo Not happy
false
else
echo "happy - failed correctly"
fi &&
git checkout -m renamer &&
fill 1 3 4 5 7 8 >expect &&
diff expect uno &&
! test -f one
'
test_done test_done