merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/builtin/fetch.c b/builtin/fetch.c
index bd7a10164f4fed8aeb6e8148e2ae8c0a793e7ee0..5bd00d064a7fbfb828f7a7c5e79f8ed0a5a1e959 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1075,6 +1075,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
                }
        }
 
+       /* no need to be strict, transport_set_option() will validate it again */
+       if (depth && atoi(depth) < 1)
+               die(_("depth %s is not a positive number"), depth);
+
        if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
                if (recurse_submodules_default) {
                        int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);