diff options
| -rw-r--r-- | NOTES.git-debrebase | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-newupstream-v0 | 27 |
2 files changed, 25 insertions, 4 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 155d0da..b4ffdda 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -1,6 +1,4 @@ TODO - --anchor option to specify commit(s) to treat as as anchor(s) - reference docs git-debrebase(5) data model git-debrebase(1) command line diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index 7bd017b..1c3147e 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -23,14 +23,37 @@ new-upstream 2.1 : 'maintainer hat' -git checkout master - +git branch startpoint v=2.1-1 +git checkout master + t-git-debrebase new-upstream-v0 $v t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched +git branch ordinary + +: 'with --anchor' + +git reset --hard startpoint +t-git-next-date + +t-git-debrebase analyse >../anal.anch +anchor=$(perl <../anal.anch -ne ' + next unless m/^(\w+) Anchor\s/; + print $1,"\n"; + exit; +') + +t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v +t-gdr-good laundered + +t-git-debrebase stitch +t-gdr-good stitched + +git diff --quiet ordinary + t-ok |