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: Snag on repeated conversions
[dgit.git]
/
tests
/
lib-orig-include-exclude
diff --git
a/tests/lib-orig-include-exclude
b/tests/lib-orig-include-exclude
index 7c29c962116f90148de7493db04b0f4e604689a1..104cf0b8bb1b3433dd9839a0b68a4d8add0cee9e 100644
(file)
--- a/
tests/lib-orig-include-exclude
+++ b/
tests/lib-orig-include-exclude
@@
-21,14
+21,15
@@
cd $p
test-push-1 () {
v=$1
ch=$2
test-push-1 () {
v=$1
ch=$2
+ suite=$3
- t-commit $v $v
+ t-commit $v $v
$suite
t-dgit $ch build
}
test-push-2 () {
$test_push_2_hook
t-dgit $ch build
}
test-push-2 () {
$test_push_2_hook
- t-dgit $ch push
+ t-dgit $ch
"$@"
push
}
test-push-1 1.0-2 --ch:-sa
}
test-push-1 1.0-2 --ch:-sa
@@
-37,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
@@
-58,3
+64,4
@@
cd get
t-dgit clone $p
# ^ checks that all the origs are there, ie that dgit added the origs
t-dgit clone $p
# ^ checks that all the origs are there, ie that dgit added the origs
+cd ..