mergetools/meld: make usage of `--output` configurable and more robust

diff --git a/imap-send.c b/imap-send.c
index 83a6ed2ac338d7fc82f3bed6fcb93ffe8dae5739..524fbabc96f450f1faed196c1743d2f8d697b587 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -1328,13 +1328,9 @@ static char *imap_folder;
 
 static int git_imap_config(const char *key, const char *val, void *cb)
 {
-       char imap_key[] = "imap.";
-
-       if (strncmp(key, imap_key, sizeof imap_key - 1))
+       if (!skip_prefix(key, "imap.", &key))
                return 0;
 
-       key += sizeof imap_key - 1;
-
        /* check booleans first, and barf on others */
        if (!strcmp("sslverify", key))
                server.ssl_verify = git_config_bool(key, val);