diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:02 -0800 |
| commit | fd6abd0c65b38897da64ef883ed1934d2b2b1a3a (patch) | |
| tree | 8c787e5034449bda1dfd0ad5c4d1c17128354d3e /builtin | |
| parent | d88698ec0b4b91e61b0fe3e00d7451abcdf4cd44 (diff) | |
| parent | b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 (diff) | |
| download | git-fd6abd0c65b38897da64ef883ed1934d2b2b1a3a.tar.gz git-fd6abd0c65b38897da64ef883ed1934d2b2b1a3a.tar.xz | |
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'
* jc/merge-ff-only-stronger-than-signed-merge:
merge: do not create a signed tag merge under --ff-only option
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 62c7b6817..7e6db3bb3 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1320,7 +1320,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) sha1_to_hex(commit->object.sha1)); setenv(buf.buf, argv[i], 1); strbuf_reset(&buf); - if (merge_remote_util(commit) && + if (!fast_forward_only && + merge_remote_util(commit) && merge_remote_util(commit)->obj && merge_remote_util(commit)->obj->type == OBJ_TAG) { option_edit = 1; |