chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: gitattributes: Rename a sums file to the right name
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index 08717dd413c113cfc7eca638c2a85058de3b3b89..9eb75371102f14e4648f8bef5d12f0d907c462db 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-47,6
+47,7
@@
t-gdr-good () {
;;
stitched) etypes=Pseudomerge-Upstream ;;
pushed) etypes=AddPatches-Pseudomerge-Upstream ;;
;;
stitched) etypes=Pseudomerge-Upstream ;;
pushed) etypes=AddPatches-Pseudomerge-Upstream ;;
+ pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
esac
t-git-debrebase analyse >../anal.check
esac
t-git-debrebase analyse >../anal.check
@@
-68,6
+69,7
@@
t-gdr-good () {
Packaging/SAME) ;;
Packaging/Upstream) ;;
AddPatches/SAME) ;;
Packaging/SAME) ;;
Packaging/Upstream) ;;
AddPatches/SAME) ;;
+ AddPatches/AddPatchesInterop) ;;
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
Changelog/Packaging) ;;
Changelog/Upstream) ;;
Upstream/SAME) ;;
@@
-87,6
+89,13
@@
t-gdr-good () {
fi
esac
fi
esac
+ case "$cetype" in
+ AddPatchesInterop)
+ git log -n1 --pretty=format:%B \
+ | grep '^\[git-debrebase[ :]'
+ ;;
+ esac
+
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}
case "$ctype" in
Pseudomerge)
expect=${info#Contributor=}