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: Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild tests.
[dgit.git]
/
tests
/
tests
/
gdr-newupstream
diff --git
a/tests/tests/gdr-newupstream
b/tests/tests/gdr-newupstream
index 536f49c218d2ea90afac7057d9d9017bf5ce4454..39ed24b86bf5e5dcd817e70e7cba3021afb98b7b 100755
(executable)
--- a/
tests/tests/gdr-newupstream
+++ b/
tests/tests/gdr-newupstream
@@
-1,5
+1,6
@@
#!/bin/bash
set -e
#!/bin/bash
set -e
+autoimport=
. tests/lib
t-dependencies NO-DGIT GDR
. tests/lib
t-dependencies NO-DGIT GDR
@@
-35,8
+36,10
@@
t-git-debrebase new-upstream $v
git tag v2.1 upstream
git tag v2.1 upstream
-t-git-debrebase new-upstream $v
+t-git-debrebase new-upstream ${v%-*}
+
t-gdr-good laundered
t-gdr-good laundered
+git reflog | egrep 'debrebase new-upstream.*checkout'
t-git-debrebase stitch
t-gdr-good stitched
t-git-debrebase stitch
t-gdr-good stitched
@@
-54,8
+57,11
@@
anchor=$(perl <../anal.anch -ne '
exit;
')
exit;
')
+GIT_REFLOG_ACTION='STUNT-RLA' \
t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
t-gdr-good laundered
t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
t-gdr-good laundered
+git reflog | egrep 'STUNT-RLA: debrebase new-upstream'
+git reflog | egrep 'STUNT-RLA: debrebase: launder for new upstream'
t-git-debrebase stitch
t-gdr-good stitched
t-git-debrebase stitch
t-gdr-good stitched