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: test suite: t-gdr-good: test git-debrebase breakwater
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index d6d33f7851e568ff0bcf64ea1c69dd3d2f872f1c..aeb7725411eb20038eb307b525644defb7f3f77d 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-22,10
+22,13
@@
t-gdr-good () {
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
- local etype netype
+ local etype netype
bwtip
case $state in
case $state in
- laundered) etype=Upstream ;;
+ laundered)
+ etype=Upstream
+ bwtip=Y:`t-git-debrebase breakwater`
+ ;;
stitched) etype=Pseudomerge ;;
pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
stitched) etype=Pseudomerge ;;
pushed) etype=AddPatches; netype=Pseudomerge ;;
esac
@@
-43,6
+46,7
@@
t-gdr-good () {
expect="$parents"
enparents=1
: "$ctype/$cetype" "$parents"
expect="$parents"
enparents=1
: "$ctype/$cetype" "$parents"
+
case "$ctype/$cetype" in
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
case "$ctype/$cetype" in
Pseudomerge/SAME) ;;
Packaging/SAME) ;;
@@
-58,6
+62,15
@@
t-gdr-good () {
;;
esac
;;
esac
+ case "$ctype/$etype" in
+ Packaging/Upstream|\
+ Changelog/Upstream)
+ if [ "x$bwtip" != x ]; then
+ test "$bwtip" = "Y:$cid"
+ bwtip=''
+ fi
+ esac
+
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}