Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5519: do not assume the "matching" push is the default
author
Junio C Hamano
<gitster@pobox.com>
Sat, 5 Jan 2013 00:10:18 +0000
(16:10 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 5 Jan 2013 06:28:41 +0000
(22:28 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5519-push-alternates.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
93912fd
)
diff --git
a/t/t5519-push-alternates.sh
b/t/t5519-push-alternates.sh
index c00c9b071d696038f63e8d613e11beab68eb547e..11fcd37700f372117145258f209e6c56ae04a1fc 100755
(executable)
--- a/
t/t5519-push-alternates.sh
+++ b/
t/t5519-push-alternates.sh
@@
-40,7
+40,7
@@
test_expect_success 'alice works and pushes' '
cd alice-work &&
echo more >file &&
git commit -a -m second &&
cd alice-work &&
echo more >file &&
git commit -a -m second &&
- git push ../alice-pub
+ git push ../alice-pub
:
)
'
)
'
@@
-57,7
+57,7
@@
test_expect_success 'bob fetches from alice, works and pushes' '
git pull ../alice-pub master &&
echo more bob >file &&
git commit -a -m third &&
git pull ../alice-pub master &&
echo more bob >file &&
git commit -a -m third &&
- git push ../bob-pub
+ git push ../bob-pub
:
) &&
# Check that the second commit by Alice is not sent
) &&
# Check that the second commit by Alice is not sent
@@
-86,7
+86,7
@@
test_expect_success 'alice works and pushes again' '
cd alice-work &&
echo more alice >file &&
git commit -a -m fourth &&
cd alice-work &&
echo more alice >file &&
git commit -a -m fourth &&
- git push ../alice-pub
+ git push ../alice-pub
:
)
'
)
'
@@
-99,7
+99,7
@@
test_expect_success 'bob works and pushes' '
cd bob-work &&
echo yet more bob >file &&
git commit -a -m fifth &&
cd bob-work &&
echo yet more bob >file &&
git commit -a -m fifth &&
- git push ../bob-pub
+ git push ../bob-pub
:
)
'
)
'
@@
-115,7
+115,7
@@
test_expect_success 'alice works and pushes yet again' '
git commit -a -m sixth.2 &&
echo more and more alice >>file &&
git commit -a -m sixth.3 &&
git commit -a -m sixth.2 &&
echo more and more alice >>file &&
git commit -a -m sixth.3 &&
- git push ../alice-pub
+ git push ../alice-pub
:
)
'
)
'
@@
-136,7
+136,7
@@
test_expect_success 'bob works and pushes again' '
git hash-object -t commit -w commit &&
echo even more bob >file &&
git commit -a -m seventh &&
git hash-object -t commit -w commit &&
echo even more bob >file &&
git commit -a -m seventh &&
- git push ../bob-pub
+ git push ../bob-pub
:
)
'
)
'