diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:42:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:42:11 -0800 |
| commit | 5a62b531ae1fda10d023082cb73a5440dbd54df1 (patch) | |
| tree | 42895bf2539d5bf3ed6e17936d19679ffd2a9f6c /builtin | |
| parent | Merge branch 'jc/branch-desc-typoavoidance' into maint (diff) | |
| parent | merge: do not create a signed tag merge under --ff-only option (diff) | |
| download | tgif-5a62b531ae1fda10d023082cb73a5440dbd54df1.tar.xz | |
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint
* 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 3a451727d0..b4fbc60e6d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1283,7 +1283,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; |