chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Declare fast forward from 0.22-experimental2
[dgit.git]
/
tests
/
lib-orig-include-exclude
diff --git
a/tests/lib-orig-include-exclude
b/tests/lib-orig-include-exclude
index 75a965630ac04b5c3627a8ddc04d31c231f24638..104cf0b8bb1b3433dd9839a0b68a4d8add0cee9e 100644
(file)
--- a/
tests/lib-orig-include-exclude
+++ b/
tests/lib-orig-include-exclude
@@
-38,12
+38,17
@@
grep orig ../${p}_${v}_*.changes
test-push-2
test-push-2
+origs_findls () {
+ find $tmp/mirror -name '*orig*' -ls \
+ | perl -pe 's/^(\s*\d+\s+\d+\s+\S+\s)\s*\d+(\s)/$1$2/'
+}
+
# check that dgit stripped out the orig update
# check that dgit stripped out the orig update
-
find $tmp/mirror -name '*orig*' -
ls >../before
+
origs_find
ls >../before
t-archive-process-incoming sid
t-archive-process-incoming sid
-
find $tmp/mirror -name '*orig*' -
ls >../after
+
origs_find
ls >../after
diff -u ../before ../after
test-push-1 1.1-1.2 --ch:-sd
diff -u ../before ../after
test-push-1 1.1-1.2 --ch:-sd