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: dch: Always use tstunt/debchange
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index e2496b43a0355d45f67fc345622df66705c8de33..376585ca9cc02205a35f0dd39d1c8fd56577017d 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-66,6
+66,7
@@
ln -f $troot/ssh ssh
export DEBCHANGE_VENDOR=dpkg
unset VISUAL
export DEBCHANGE_VENDOR=dpkg
unset VISUAL
+unset GIT_EDITOR
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
@@
-1040,7
+1041,8
@@
t-merge-conflicted-stripping-conflict-markers () {
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
- dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
+ $troot/tstunt/debchange \
+ --force-distribution -v$v --distribution ${3:-unstable} "$1"
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))
@@
-1057,7
+1059,7
@@
t-dch-commit-r () {
}
t-dch-commit () {
}
t-dch-commit () {
-
faketime @"${GIT_AUTHOR_DATE% *}" dch
"$@"
+
$troot/tstunt/debchange
"$@"
git commit -m "dch $*" debian/changelog
}
git commit -m "dch $*" debian/changelog
}