Merge branch 'af/maint-install-no-handlink'

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index b280444e10d67355da6fd0d9e1a2dd2d7a29d440..0bff26e8332f44bad12b391bb811442c9c93731e 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -834,6 +834,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                if (argc != 1)
                        die("Can merge only exactly one commit into "
                                "empty head");
+               if (squash)
+                       die("Squash commit into empty head not supported yet");
+               if (!allow_fast_forward)
+                       die("Non-fast-forward commit does not make sense into "
+                           "an empty head");
                remote_head = peel_to_type(argv[0], 0, NULL, OBJ_COMMIT);
                if (!remote_head)
                        die("%s - not something we can merge", argv[0]);