Make tests pass with recent git (1.7.0 and up).

It seems that in older versions, --message="" was interpreted as "use the
default commit message" instead of "use an empty commit message", and
git-subtree was depending on this behaviour.  Now we don't, so tests pass
again.
This commit is contained in:
Avery Pennarun 2010-02-06 15:05:17 -05:00
parent 37668a13ed
commit 349a70d5cf

View File

@ -603,7 +603,11 @@ cmd_merge()
rev="$new"
fi
git merge -s subtree --message="$message" $rev
if [ -n "$message" ]; then
git merge -s subtree --message="$message" $rev
else
git merge -s subtree $rev
fi
}
cmd_pull()