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: Test --dgit-view-save everywhere
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 03bb12da073636c7b17868cd2ddd895c847bd5f4..caa69d0964d3c7b1e1aa377698eb0004668bb150 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-489,17
+489,19
@@
t-ref-head () {
t-ref-same-val () {
local name="$1"
local val=$2
t-ref-same-val () {
local name="$1"
local val=$2
- case "$
t_ref_val
" in
-
'')
;;
+ case "$
{t_ref_val-unset}
" in
+
unset)
;;
"$val") ;;
"$val") ;;
- *) fail "ref varies:
$name:
\
- ${val:-nothing} != ${t_ref_val:-nothing}" ;;
+ *) fail "ref varies:
($name)
\
+ ${val:-nothing} != ${t_ref_val:-nothing}
(${t_ref_names[*]})
" ;;
esac
t_ref_val="$val"
esac
t_ref_val="$val"
+ t_ref_names+=("$name")
}
t-refs-same-start () {
}
t-refs-same-start () {
- t_ref_val=''
+ unset t_ref_val
+ t_ref_names=()
}
t-refs-same () {
}
t-refs-same () {
@@
-616,6
+618,13
@@
t-splitbrain-pushed-good-start () {
git merge-base --is-ancestor $dep14tag $dgittag
t-refs-same-start
git merge-base --is-ancestor $dep14tag $dgittag
t-refs-same-start
+ t-ref-same refs/heads/split.p
+ case "$(t-git-get-ref refs/heads/split.b)" in
+ "$t_ref_val") ;;
+ "$(git rev-parse refs/heads/split.p^0)") ;;
+ "$(git rev-parse refs/heads/split.p^1)") ;;
+ *) fail 'bad b/p' ;;
+ esac
t-pushed-good-core
t-incoming-dsc
t-pushed-good-core
t-incoming-dsc