From 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 15 Aug 2010 20:11:06 -0500 Subject: merge: let custom strategies intervene in trivial merges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies do not even kick in when the merge is truly trivial. But they should, since otherwise a custom “--strategy=theirs” is not useful. Perhaps custom strategies should not allow fast-forward either. This patch does not make that change, since it is less important (because it is always possible to explicitly use --no-ff). Reported-by: Yaroslav Halchenko Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin/merge.c') diff --git a/builtin/merge.c b/builtin/merge.c index 37ce4f589f..e48e90bb69 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -131,6 +131,7 @@ static struct strategy *get_strategy(const char *name) ret = xcalloc(1, sizeof(struct strategy)); ret->name = xstrdup(name); + ret->attr = NO_TRIVIAL; return ret; } -- cgit v1.2.3