send-email: change --no-validate to boolean --[no-]validate

diff --git a/merge-recursive.c b/merge-recursive.c
index d4f12d0a4d6b19be704c210b994cc97adddbeb5e..6bc3eac85c46700b1ed7ab93bce6ecf859fa13f9 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -19,6 +19,7 @@
 #include "interpolate.h"
 #include "attr.h"
 #include "merge-recursive.h"
+#include "dir.h"
 
 static struct tree *shift_tree_object(struct tree *one, struct tree *two)
 {
@@ -35,18 +36,14 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two)
 }
 
 /*
- * A virtual commit has
- * - (const char *)commit->util set to the name, and
- * - *(int *)commit->object.sha1 set to the virtual id.
+ * A virtual commit has (const char *)commit->util set to the name.
  */
 
 struct commit *make_virtual_commit(struct tree *tree, const char *comment)
 {
        struct commit *commit = xcalloc(1, sizeof(struct commit));
-       static unsigned virtual_id = 1;
        commit->tree = tree;
        commit->util = (void*)comment;
-       *(int*)commit->object.sha1 = virtual_id++;
        /* avoid warnings */
        commit->object.parsed = 1;
        return commit;
@@ -77,9 +74,6 @@ struct stage_data
        unsigned processed:1;
 };
 
-static struct string_list current_file_set = {NULL, 0, 0, 1};
-static struct string_list current_directory_set = {NULL, 0, 0, 1};
-
 static int show(struct merge_options *o, int v)
 {
        return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
@@ -232,25 +226,27 @@ static int save_files_dirs(const unsigned char *sha1,
 {
        int len = strlen(path);
        char *newpath = xmalloc(baselen + len + 1);
+       struct merge_options *o = context;
+
        memcpy(newpath, base, baselen);
        memcpy(newpath + baselen, path, len);
        newpath[baselen + len] = '\0';
 
        if (S_ISDIR(mode))
-               string_list_insert(newpath, &current_directory_set);
+               string_list_insert(newpath, &o->current_directory_set);
        else
-               string_list_insert(newpath, &current_file_set);
+               string_list_insert(newpath, &o->current_file_set);
        free(newpath);
 
        return READ_TREE_RECURSIVE;
 }
 
-static int get_files_dirs(struct tree *tree)
+static int get_files_dirs(struct merge_options *o, struct tree *tree)
 {
        int n;
-       if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, NULL))
+       if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
                return 0;
-       n = current_file_set.nr + current_directory_set.nr;
+       n = o->current_file_set.nr + o->current_directory_set.nr;
        return n;
 }
 
@@ -397,24 +393,6 @@ static int update_stages(const char *path, struct diff_filespec *o,
        return 0;
 }
 
-static int remove_path(const char *name)
-{
-       int ret;
-       char *slash, *dirs;
-
-       ret = unlink(name);
-       if (ret)
-               return ret;
-       dirs = xstrdup(name);
-       while ((slash = strrchr(name, '/'))) {
-               *slash = '\0';
-               if (rmdir(name) != 0)
-                       break;
-       }
-       free(dirs);
-       return ret;
-}
-
 static int remove_file(struct merge_options *o, int clean,
                       const char *path, int no_wd)
 {
@@ -426,15 +404,13 @@ static int remove_file(struct merge_options *o, int clean,
                        return -1;
        }
        if (update_working_directory) {
-               unlink(path);
-               if (errno != ENOENT || errno != EISDIR)
+               if (remove_path(path) && errno != ENOENT)
                        return -1;
-               remove_path(path);
        }
        return 0;
 }
 
-static char *unique_path(const char *path, const char *branch)
+static char *unique_path(struct merge_options *o, const char *path, const char *branch)
 {
        char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
        int suffix = 0;
@@ -446,12 +422,12 @@ static char *unique_path(const char *path, const char *branch)
        for (; *p; ++p)
                if ('/' == *p)
                        *p = '_';
-       while (string_list_has_string(&current_file_set, newpath) ||
-              string_list_has_string(&current_directory_set, newpath) ||
+       while (string_list_has_string(&o->current_file_set, newpath) ||
+              string_list_has_string(&o->current_directory_set, newpath) ||
               lstat(newpath, &st) == 0)
                sprintf(p, "_%d", suffix++);
 
-       string_list_insert(newpath, &current_file_set);
+       string_list_insert(newpath, &o->current_file_set);
        return newpath;
 }
 
@@ -716,14 +692,14 @@ static void conflict_rename_rename(struct merge_options *o,
        const char *ren2_dst = ren2->pair->two->path;
        const char *dst_name1 = ren1_dst;
        const char *dst_name2 = ren2_dst;
-       if (string_list_has_string(&current_directory_set, ren1_dst)) {
-               dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
+       if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
+               dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
                output(o, 1, "%s is a directory in %s adding as %s instead",
                       ren1_dst, branch2, dst_name1);
                remove_file(o, 0, ren1_dst, 0);
        }
-       if (string_list_has_string(&current_directory_set, ren2_dst)) {
-               dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
+       if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
+               dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
                output(o, 1, "%s is a directory in %s adding as %s instead",
                       ren2_dst, branch1, dst_name2);
                remove_file(o, 0, ren2_dst, 0);
@@ -749,7 +725,7 @@ static void conflict_rename_dir(struct merge_options *o,
                                struct rename *ren1,
                                const char *branch1)
 {
-       char *new_path = unique_path(ren1->pair->two->path, branch1);
+       char *new_path = unique_path(o, ren1->pair->two->path, branch1);
        output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
        remove_file(o, 0, ren1->pair->two->path, 0);
        update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
@@ -762,8 +738,8 @@ static void conflict_rename_rename_2(struct merge_options *o,
                                     struct rename *ren2,
                                     const char *branch2)
 {
-       char *new_path1 = unique_path(ren1->pair->two->path, branch1);
-       char *new_path2 = unique_path(ren2->pair->two->path, branch2);
+       char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
+       char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
        output(o, 1, "Renaming %s to %s and %s to %s instead",
               ren1->pair->one->path, new_path1,
               ren2->pair->one->path, new_path2);
@@ -913,7 +889,7 @@ static int process_renames(struct merge_options *o,
 
                        try_merge = 0;
 
-                       if (string_list_has_string(&current_directory_set, ren1_dst)) {
+                       if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
                                clean_merge = 0;
                                output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
                                       " directory %s added in %s",
@@ -935,7 +911,7 @@ static int process_renames(struct merge_options *o,
                                       "%s added in %s",
                                       ren1_src, ren1_dst, branch1,
                                       ren1_dst, branch2);
-                               new_path = unique_path(ren1_dst, branch2);
+                               new_path = unique_path(o, ren1_dst, branch2);
                                output(o, 1, "Adding as %s instead", new_path);
                                update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
                        } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
@@ -1073,8 +1049,8 @@ static int process_entry(struct merge_options *o,
                        sha = b_sha;
                        conf = "directory/file";
                }
-               if (string_list_has_string(&current_directory_set, path)) {
-                       const char *new_path = unique_path(path, add_branch);
+               if (string_list_has_string(&o->current_directory_set, path)) {
+                       const char *new_path = unique_path(o, path, add_branch);
                        clean_merge = 0;
                        output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
                               "Adding %s as %s",
@@ -1165,10 +1141,10 @@ int merge_trees(struct merge_options *o,
        if (unmerged_cache()) {
                struct string_list *entries, *re_head, *re_merge;
                int i;
-               string_list_clear(&current_file_set, 1);
-               string_list_clear(&current_directory_set, 1);
-               get_files_dirs(head);
-               get_files_dirs(merge);
+               string_list_clear(&o->current_file_set, 1);
+               string_list_clear(&o->current_directory_set, 1);
+               get_files_dirs(o, head);
+               get_files_dirs(o, merge);
 
                entries = get_unmerged();
                re_head  = get_renames(o, head, common, head, merge, entries);
@@ -1374,4 +1350,8 @@ void init_merge_options(struct merge_options *o)
        if (o->verbosity >= 5)
                o->buffer_output = 0;
        strbuf_init(&o->obuf, 0);
+       memset(&o->current_file_set, 0, sizeof(struct string_list));
+       o->current_file_set.strdup_strings = 1;
+       memset(&o->current_directory_set, 0, sizeof(struct string_list));
+       o->current_directory_set.strdup_strings = 1;
 }