chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: tartree-edit: Provide facility for comparing sets of git refs
[dgit.git]
/
tests
/
tests
/
drs-push-masterupdate
diff --git
a/tests/tests/drs-push-masterupdate
b/tests/tests/drs-push-masterupdate
index cc77b77ab9c01da65bd7923504013edc6c962b72..9d2e6320705c30326fcae1ac79d2584a22239f8d 100755
(executable)
--- a/
tests/tests/drs-push-masterupdate
+++ b/
tests/tests/drs-push-masterupdate
@@
-16,17
+16,17
@@
t-dgit build
t-dgit push --new
push_and_check () {
t-dgit push --new
push_and_check () {
- git push $
tmp/git/$p.git
$1
+ git push $
dgitrepo
$1
- oldmaster=`cd $
tmp/git/$p.git
&& t-git-get-ref refs/heads/master`
+ oldmaster=`cd $
dgitrepo
&& t-git-get-ref refs/heads/master`
t-refs-same-start
t-refs-same-start
- git checkout
dgit/sid
+ git checkout
master
t-commit 'Empty update'
t-dgit build
t-dgit push --new
t-commit 'Empty update'
t-dgit build
t-dgit push --new
- t-pushed-good
dgit/sid
+ t-pushed-good
master
}
t-check-master-undisturbed () {
}
t-check-master-undisturbed () {
@@
-38,7
+38,7
@@
t_check_pushed_master=t-check-master-undisturbed
git checkout -b divergent common-ancestor
git commit --allow-empty -m 'Has common ancestor'
git checkout -b divergent common-ancestor
git commit --allow-empty -m 'Has common ancestor'
-git push $
tmp/git/$p.git
HEAD:master
+git push $
dgitrepo
HEAD:master
push_and_check HEAD:master
push_and_check HEAD:master