diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-15 20:11:06 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-15 20:09:48 -0700 |
| commit | 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49 (patch) | |
| tree | e92210896905c78651102470a028db2c78aa6e46 /builtin | |
| parent | 6209036c7843f4095c04b5ecc13199cc4eccaf3f (diff) | |
| download | git-52b48ef1e40fc2b996e3d3f9cad3d096482d8e49.tar.gz | |
merge: let custom strategies intervene in trivial merges
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 <debian@onerussian.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |