chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 2.16
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 52aca71b6e27cb5818bba3f040f1f5bef76aca19..50d614ee16e1346f302b2a58ef64a067b3d6dbc9 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-114,7
+114,7
@@
t-grep-mpat () {
t-expect-push-fail () {
local mpat="$1"; shift
t-expect-push-fail () {
local mpat="$1"; shift
- local triedpush=`git rev-parse HEAD`
+ local triedpush
; triedpush
=`git rev-parse HEAD`
t-reporefs pre-push
t-expect-fail "$mpat" "$@"
t-reporefs pre-push
t-expect-fail "$mpat" "$@"
@@
-191,9
+191,9
@@
t-git-merge-base () {
t-has-ancestor () {
# t-has-ancestor ANCESTOR
# (CHILD is implicit, HEAD)
t-has-ancestor () {
# t-has-ancestor ANCESTOR
# (CHILD is implicit, HEAD)
- local now=`git rev-parse HEAD`
- local ancestor=`git rev-parse $1^{}`
- local mbase=`t-git-merge-base $ancestor $now`
+ local now
; now
=`git rev-parse HEAD`
+ local ancestor
; ancestor
=`git rev-parse $1^{}`
+ local mbase
; mbase
=`t-git-merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
@@
-203,7
+203,8
@@
t-has-parent-or-is () {
# t-has-parent-or-is CHILD PARENT
local child=$1
local parent=$2
# t-has-parent-or-is CHILD PARENT
local child=$1
local parent=$2
- local parents=$(git show --pretty=format:' %P %H ' "$child")
+ local parents
+ parents=$(git show --pretty=format:' %P %H ' "$child")
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
@@
-310,7
+311,7
@@
t-archive-query-aq () {
local p=$2
local v=$3
local dscf=$4
local p=$2
local v=$3
local dscf=$4
- local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+ local sha
; sha
=`sha256sum <$tmp/mirror/pool/$dscf`
echo "${v} ${sha% -} $dscf" >>$tmp/aq/package.$suite.${p}
t-aq-archive-updated $suite $p
}
echo "${v} ${sha% -} $dscf" >>$tmp/aq/package.$suite.${p}
t-aq-archive-updated $suite $p
}
@@
-528,18
+529,18
@@
t-git-get-ref () {
t-ref-same-exact () {
local name="$1"
t-ref-same-exact () {
local name="$1"
- local val=`t-git-get-ref-exact $name`
+ local val
; val
=`t-git-get-ref-exact $name`
t-ref-same-val "$name" $val
}
t-ref-same () {
local name="$1"
t-ref-same-val "$name" $val
}
t-ref-same () {
local name="$1"
- local val=`t-git-get-ref $name`
+ local val
; val
=`t-git-get-ref $name`
t-ref-same-val "$name" $val
}
t-ref-head () {
t-ref-same-val "$name" $val
}
t-ref-head () {
- local val=`git rev-parse HEAD`
+ local val
; val
=`git rev-parse HEAD`
t-ref-same-val HEAD $val
}
t-ref-same-val HEAD $val
}
@@
-589,11
+590,11
@@
t-format-ref () {
t-sametree-parent () {
local ref=$1
local parent
t-sametree-parent () {
local ref=$1
local parent
- local ctree=$(t-format-ref '%T' "$ref")
+ local ctree
; ctree
=$(t-format-ref '%T' "$ref")
while :; do
local psame=''
for parent in $(t-format-ref '%P' "$ref"); do
while :; do
local psame=''
for parent in $(t-format-ref '%P' "$ref"); do
- local ptree=$(t-format-ref '%T' "$parent")
+ local ptree
; ptree
=$(t-format-ref '%T' "$parent")
if [ "x$ptree" = "x$ctree" ]; then
psame+=" $parent"
fi
if [ "x$ptree" = "x$ctree" ]; then
psame+=" $parent"
fi
@@
-605,11
+606,11
@@
t-sametree-parent () {
}
t-check-pushed-master () {
}
t-check-pushed-master () {
- local master=`t-git-get-ref refs/heads/master`
+ local master
; master
=`t-git-get-ref refs/heads/master`
if [ x$master = x$t_ref_val ]; then return; fi
if [ x$master = x ]; then fail "failed to push master"; fi
# didn't update master, it must be not FF
if [ x$master = x$t_ref_val ]; then return; fi
if [ x$master = x ]; then fail "failed to push master"; fi
# didn't update master, it must be not FF
- local mbase=`t-git-merge-base $master $t_ref_val`
+ local mbase
; mbase
=`t-git-merge-base $master $t_ref_val`
if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
}
if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
}
@@
-822,7
+823,7
@@
t-incoming-dsc () {
t-ref-dsc-dgit () {
t-incoming-dsc
t-ref-dsc-dgit () {
t-incoming-dsc
- local val=`t-822-field $incoming_dsc Dgit`
+ local val
; val
=`t-822-field $incoming_dsc Dgit`
perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
t-ref-same-val $incoming_dsc "$val"
}
perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
t-ref-same-val $incoming_dsc "$val"
}
@@
-898,6
+899,15
@@
t-gbp-example-prep () {
remotes/dgit/dgit/sid
}
remotes/dgit/dgit/sid
}
+t-make-badcommit () {
+ badcommit=$(
+ git cat-file commit HEAD | \
+ perl -pe 's/^committer /commiter /' | \
+ git hash-object -w -t commit --stdin
+ )
+ t-expect-fsck-fail $badcommit
+}
+
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}