am: avoid directory rename detection when calling recursive merge machinery

diff --git a/builtin/config.c b/builtin/config.c
index 69e7270356c5a4da8372201ac80ec0d33e8909c2..b29d26dede79b9a5c46bdc4f951b22e7b88310b3 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -398,7 +398,7 @@ static char *normalize_value(const char *key, const char *value)
                return xstrdup(value);
        }
 
-       die("BUG: cannot normalize type %d", type);
+       BUG("cannot normalize type %d", type);
 }
 
 static int get_color_found;
@@ -602,6 +602,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
        if (use_local_config && nongit)
                die(_("--local can only be used inside a git repository"));
 
+       if (given_config_source.blob && nongit)
+               die(_("--blob can only be used inside a git repository"));
+
        if (given_config_source.file &&
                        !strcmp(given_config_source.file, "-")) {
                given_config_source.file = NULL;