diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:04:39 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:14:21 +0100 |
| commit | edc1cd049cfa01e7d6249ea199725d2448858704 (patch) | |
| tree | 19b33409c2401b5799a7a81dd573f09077b0eed1 /tests/tests | |
| parent | 1e87a7002be126e23144cd2b0a43271e522a75e7 (diff) | |
git-debrebase: Use git-deborig style upstream commitish finding
As discussed in email with Sean.
We could use git-deborig --just-print --version= but its error
handling is rather troublesome.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-newupstream-v0 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index 9b283c0..485c808 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -30,6 +30,11 @@ v=2.1-1 git checkout master +t-expect-fail F:'Could not determine appropriate upstream commitish' \ +t-git-debrebase new-upstream-v0 $v + +git tag v2.1 upstream + t-git-debrebase new-upstream-v0 $v t-gdr-good laundered @@ -49,7 +54,7 @@ anchor=$(perl <../anal.anch -ne ' exit; ') -t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v +t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v upstream t-gdr-good laundered t-git-debrebase stitch |