diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 22:06:24 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 22:46:35 +0000 |
| commit | d7a8b709fff008ddc507f497b055f2f883b733bf (patch) | |
| tree | 8509090ea40951323028c7388133454d5c7369b4 /tests/tests/inarchivecopy | |
| parent | 889fdc22aea7073fe6284328b9b30efb86b88e7d (diff) | |
Test suite: Change t-has-parent to t-has-parent-or-is
This is only used by the inarchivecopy test. And that ought not to
fail if there is no into-suite pseudomerge: that is, when the suite
branch contains the intended commit, rather than something merging the
intended commit into the suite branch.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/inarchivecopy')
| -rwxr-xr-x | tests/tests/inarchivecopy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy index 394a214..c83a5d3 100755 --- a/tests/tests/inarchivecopy +++ b/tests/tests/inarchivecopy @@ -21,7 +21,7 @@ copy-check-good () { git diff $vtag t-refs-same refs/remotes/dgit/dgit/stable t-ref-head - t-has-parent HEAD $vtag + t-has-parent-or-is HEAD $vtag } copy-check () { |