X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=dc88643243e9f97465c012164889e6aefd9d6d0e;hb=e5dcd8e57251ade4f309357bd6cfe2501bdc1afb;hp=6533a90b7aac96ec9d0e93eb2b08c544cb361237;hpb=f59ad0b300d08bbc4ce630188d3fc990003ffdaf;p=dgit.git diff --git a/tests/lib b/tests/lib index 6533a90b..dc886432 100644 --- a/tests/lib +++ b/tests/lib @@ -422,6 +422,7 @@ t-dgit () { {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \ + ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \ ${distro+${distro:+-d}}${distro--dtest-dummy} \ $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \ -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@" @@ -479,7 +480,7 @@ t-setup-done () { local savedirs=$2 local importeval=$3 - local import=IMPORT.${0##*/} + local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}} exec 4>$tmp/$import.new local vn @@ -1005,7 +1006,7 @@ t-commit () { } t-dch-commit () { - dch "$@" + faketime @"${GIT_AUTHOR_DATE% *}" dch "$@" git commit -m "dch $*" debian/changelog }