Merge branch 'nh/empty-rebase'

diff --git a/diff-no-index.c b/diff-no-index.c
index aae8e7accc1ff955bd76c62b379b37f343f61cc4..b44473e3c1fd5c2bdc4dce3af7aabc86fd37eb08 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -26,7 +26,7 @@ static int read_directory(const char *path, struct string_list *list)
 
        while ((e = readdir(dir)))
                if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
-                       string_list_insert(e->d_name, list);
+                       string_list_insert(list, e->d_name);
 
        closedir(dir);
        return 0;
@@ -52,7 +52,7 @@ static int get_mode(const char *path, int *mode)
 }
 
 static int queue_diff(struct diff_options *o,
-               const char *name1, const char *name2)
+                     const char *name1, const char *name2)
 {
        int mode1 = 0, mode2 = 0;
 
@@ -63,9 +63,11 @@ static int queue_diff(struct diff_options *o,
                return error("file/directory conflict: %s, %s", name1, name2);
 
        if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
-               char buffer1[PATH_MAX], buffer2[PATH_MAX];
-               struct string_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1};
-               int len1 = 0, len2 = 0, i1, i2, ret = 0;
+               struct strbuf buffer1 = STRBUF_INIT;
+               struct strbuf buffer2 = STRBUF_INIT;
+               struct string_list p1 = STRING_LIST_INIT_DUP;
+               struct string_list p2 = STRING_LIST_INIT_DUP;
+               int i1, i2, ret = 0;
 
                if (name1 && read_directory(name1, &p1))
                        return -1;
@@ -75,19 +77,15 @@ static int queue_diff(struct diff_options *o,
                }
 
                if (name1) {
-                       len1 = strlen(name1);
-                       if (len1 > 0 && name1[len1 - 1] == '/')
-                               len1--;
-                       memcpy(buffer1, name1, len1);
-                       buffer1[len1++] = '/';
+                       strbuf_addstr(&buffer1, name1);
+                       if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')
+                               strbuf_addch(&buffer1, '/');
                }
 
                if (name2) {
-                       len2 = strlen(name2);
-                       if (len2 > 0 && name2[len2 - 1] == '/')
-                               len2--;
-                       memcpy(buffer2, name2, len2);
-                       buffer2[len2++] = '/';
+                       strbuf_addstr(&buffer2, name2);
+                       if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')
+                               strbuf_addch(&buffer2, '/');
                }
 
                for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
@@ -99,29 +97,28 @@ static int queue_diff(struct diff_options *o,
                        else if (i2 == p2.nr)
                                comp = -1;
                        else
-                               comp = strcmp(p1.items[i1].string,
-                                       p2.items[i2].string);
+                               comp = strcmp(p1.items[i1].string, p2.items[i2].string);
 
                        if (comp > 0)
                                n1 = NULL;
                        else {
-                               n1 = buffer1;
-                               strncpy(buffer1 + len1, p1.items[i1++].string,
-                                               PATH_MAX - len1);
+                               strbuf_addstr(&buffer1, p1.items[i1++].string);
+                               n1 = buffer1.buf;
                        }
 
                        if (comp < 0)
                                n2 = NULL;
                        else {
-                               n2 = buffer2;
-                               strncpy(buffer2 + len2, p2.items[i2++].string,
-                                               PATH_MAX - len2);
+                               strbuf_addstr(&buffer2, p2.items[i2++].string);
+                               n2 = buffer2.buf;
                        }
 
                        ret = queue_diff(o, n1, n2);
                }
                string_list_clear(&p1, 0);
                string_list_clear(&p2, 0);
+               strbuf_reset(&buffer1);
+               strbuf_reset(&buffer2);
 
                return ret;
        } else {
@@ -150,16 +147,14 @@ static int queue_diff(struct diff_options *o,
 
 static int path_outside_repo(const char *path)
 {
-       /*
-        * We have already done setup_git_directory_gently() so we
-        * know we are inside a git work tree already.
-        */
        const char *work_tree;
        size_t len;
 
        if (!is_absolute_path(path))
                return 0;
        work_tree = get_git_work_tree();
+       if (!work_tree)
+               return 1;
        len = strlen(work_tree);
        if (strncmp(path, work_tree, len) ||
            (path[len] != '\0' && path[len] != '/'))
@@ -232,8 +227,9 @@ void diff_no_index(struct rev_info *revs,
 
        if (prefix) {
                int len = strlen(prefix);
+               const char *paths[3];
+               memset(paths, 0, sizeof(paths));
 
-               revs->diffopt.paths = xcalloc(2, sizeof(char *));
                for (i = 0; i < 2; i++) {
                        const char *p = argv[argc - 2 + i];
                        /*
@@ -243,12 +239,12 @@ void diff_no_index(struct rev_info *revs,
                        p = (strcmp(p, "-")
                             ? xstrdup(prefix_filename(prefix, len, p))
                             : p);
-                       revs->diffopt.paths[i] = p;
+                       paths[i] = p;
                }
+               diff_tree_setup_paths(paths, &revs->diffopt);
        }
        else
-               revs->diffopt.paths = argv + argc - 2;
-       revs->diffopt.nr_paths = 2;
+               diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
        revs->diffopt.skip_stat_unmatch = 1;
        if (!revs->diffopt.output_format)
                revs->diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -260,8 +256,8 @@ void diff_no_index(struct rev_info *revs,
        if (diff_setup_done(&revs->diffopt) < 0)
                die("diff_setup_done failed");
 
-       if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
-                      revs->diffopt.paths[1]))
+       if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
+                      revs->diffopt.pathspec.raw[1]))
                exit(1);
        diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
        diffcore_std(&revs->diffopt);