pull: support pull.ff config

diff --git a/dir.c b/dir.c
index d318ffcb2a6a51feca5aee993049fd0fa64acc8f..8209f8b8af1e1e3dbc9c166ca351b602de5e6f7a 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -401,7 +401,6 @@ int report_path_error(const char *ps_matched,
        /*
         * Make sure all pathspec matched; otherwise it is an error.
         */
-       struct strbuf sb = STRBUF_INIT;
        int num, errors = 0;
        for (num = 0; num < pathspec->nr; num++) {
                int other, found_dup;
@@ -433,7 +432,6 @@ int report_path_error(const char *ps_matched,
                      pathspec->items[num].original);
                errors++;
        }
-       strbuf_release(&sb);
        return errors;
 }