summaryrefslogtreecommitdiff
path: root/test/test-gall.tree.lua
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-17 15:05:54 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-17 15:05:54 +0000
commit11de77bd79c08a152932a3435d1921abc1020252 (patch)
tree28d8a0890cfda58e0868c54a6da2a2a764e6eefa /test/test-gall.tree.lua
parentf58c7526fbb0421d7f5446644f01f4cf57035ee2 (diff)
parented869f92851d75115213eb12c4d97bcde2210d59 (diff)
downloadgall-11de77bd79c08a152932a3435d1921abc1020252.tar.gz
Merge branch 'baserock/pedroalvarez/git2.8.0-rc2-fix' into baserock/morphbaserock/morph
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Franisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Diffstat (limited to 'test/test-gall.tree.lua')
-rw-r--r--test/test-gall.tree.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-gall.tree.lua b/test/test-gall.tree.lua
index e1d5449..1720aab 100644
--- a/test/test-gall.tree.lua
+++ b/test/test-gall.tree.lua
@@ -66,7 +66,7 @@ function suite.bad_diff()
local tree = commit.tree.content
local ok, msg = tree:diff_to()
assert(not ok)
- assert(msg:find("%?%?%?"))
+ assert(msg:find("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"))
end
function suite.diff_trees()