diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
| commit | ae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch) | |
| tree | 2bbf98c464b32b8ede618bf93929741246b81b5f /tests/tests/gdr-newupstream | |
| parent | 4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff) | |
| parent | 7166dbc963a9c01ce62a0564bb7b905156adb560 (diff) | |
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/tests/gdr-newupstream')
| -rwxr-xr-x | tests/tests/gdr-newupstream | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 536f49c..39ed24b 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -1,5 +1,6 @@ #!/bin/bash set -e +autoimport= . tests/lib t-dependencies NO-DGIT GDR @@ -35,8 +36,10 @@ t-git-debrebase new-upstream $v git tag v2.1 upstream -t-git-debrebase new-upstream $v +t-git-debrebase new-upstream ${v%-*} + t-gdr-good laundered +git reflog | egrep 'debrebase new-upstream.*checkout' t-git-debrebase stitch t-gdr-good stitched @@ -54,8 +57,11 @@ anchor=$(perl <../anal.anch -ne ' exit; ') +GIT_REFLOG_ACTION='STUNT-RLA' \ 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 |