-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The check that the source is ahead of the destination incorrectly expects pop_most_recent_commit() to gracefully handle an empty list. Fix by just checking the list itself, rather than the return value of the pop function. [jc: I did the test script that demonstrated the problem] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Linus Torvalds
authored and
Junio C Hamano
committed
Jul 27, 2005
1 parent
2779fad
commit bdf2514
Showing
2 changed files
with
56 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#!/bin/sh | ||
# | ||
# Copyright (c) 2005 Junio C Hamano | ||
# | ||
|
||
test_description='See why rewinding head breaks send-pack | ||
' | ||
. ./test-lib.sh | ||
|
||
cnt='1' | ||
test_expect_success setup ' | ||
tree=$(git-write-tree) && | ||
commit=$(echo "Commit #0" | git-commit-tree $tree) && | ||
zero=$commit && | ||
parent=$zero && | ||
for i in $cnt | ||
do | ||
sleep 1 && | ||
commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) && | ||
parent=$commit || exit | ||
done && | ||
echo "$commit" >.git/HEAD && | ||
git clone -l ./. victim && | ||
cd victim && | ||
git log && | ||
cd .. && | ||
echo $zero >.git/HEAD && | ||
parent=$zero && | ||
for i in $cnt | ||
do | ||
sleep 1 && | ||
commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) && | ||
parent=$commit || exit | ||
done && | ||
echo "$commit" >.git/HEAD && | ||
echo Rebase && | ||
git log' | ||
|
||
test_expect_success \ | ||
'pushing rewound head should not barf but require --force' ' | ||
# should not fail but refuse to update. | ||
git-send-pack ./victim/.git/ master && | ||
if cmp victim/.git/refs/heads/master .git/refs/heads/master | ||
then | ||
# should have been left as it was! | ||
false | ||
else | ||
true | ||
fi && | ||
# this should update | ||
git-send-pack --force ./victim/.git/ master && | ||
cmp victim/.git/refs/heads/master .git/refs/heads/master | ||
' |