chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Use git-deborig style upstream commitish finding
[dgit.git]
/
tests
/
tests
/
gdr-newupstream-v0
diff --git
a/tests/tests/gdr-newupstream-v0
b/tests/tests/gdr-newupstream-v0
index 9b283c0b7e328bf0b527c4973117247de819274c..485c8084893ca9c0a8050c0f61d06652e81324c6 100755
(executable)
--- a/
tests/tests/gdr-newupstream-v0
+++ b/
tests/tests/gdr-newupstream-v0
@@
-30,6
+30,11
@@
v=2.1-1
git checkout master
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
t-git-debrebase new-upstream-v0 $v
t-gdr-good laundered
@@
-49,7
+54,7
@@
anchor=$(perl <../anal.anch -ne '
exit;
')
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
t-gdr-good laundered
t-git-debrebase stitch