[PATCH] Make git-mv work in subdirectories, too

diff --git a/read-tree.c b/read-tree.c
index 9ace5bb0ab65cd2c0abb98e333972429e4de0dd0..df156ea0dad15ee810e8036442dfcab9202ef46a 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -12,6 +12,9 @@
 
 static int merge = 0;
 static int update = 0;
+static int index_only = 0;
+static int nontrivial_merge = 0;
+static int trivial_merges_only = 0;
 
 static int head_idx = -1;
 static int merge_size = 0;
@@ -234,6 +237,35 @@ static void reject_merge(struct cache_entry *ce)
            ce->name);
 }
 
+/* Unlink the last component and attempt to remove leading
+ * directories, in case this unlink is the removal of the
+ * last entry in the directory -- empty directories are removed.
+ */
+static void unlink_entry(char *name)
+{
+       char *cp, *prev;
+
+       if (unlink(name))
+               return;
+       prev = NULL;
+       while (1) {
+               int status;
+               cp = strrchr(name, '/');
+               if (prev)
+                       *prev = '/';
+               if (!cp)
+                       break;
+
+               *cp = 0;
+               status = rmdir(name);
+               if (status) {
+                       *cp = '/';
+                       break;
+               }
+               prev = cp;
+       }
+}
+
 static void check_updates(struct cache_entry **src, int nr)
 {
        static struct checkout state = {
@@ -247,7 +279,7 @@ static void check_updates(struct cache_entry **src, int nr)
                struct cache_entry *ce = *src++;
                if (!ce->ce_mode) {
                        if (update)
-                               unlink(ce->name);
+                               unlink_entry(ce->name);
                        continue;
                }
                if (ce->ce_flags & mask) {
@@ -274,6 +306,9 @@ static int unpack_trees(merge_fn_t fn)
        if (unpack_trees_rec(posns, len, "", fn, &indpos))
                return -1;
 
+       if (trivial_merges_only && nontrivial_merge)
+               die("Merge requires file-level merging");
+
        check_updates(active_cache, active_nr);
        return 0;
 }
@@ -306,6 +341,9 @@ static void verify_uptodate(struct cache_entry *ce)
 {
        struct stat st;
 
+       if (index_only)
+               return;
+
        if (!lstat(ce->name, &st)) {
                unsigned changed = ce_match_stat(ce, &st);
                if (!changed)
@@ -358,12 +396,15 @@ static int keep_entry(struct cache_entry *ce)
 static void show_stage_entry(FILE *o,
                             const char *label, const struct cache_entry *ce)
 {
-       fprintf(stderr, "%s%06o %s %d\t%s\n",
-               label,
-               ntohl(ce->ce_mode),
-               sha1_to_hex(ce->sha1),
-               ce_stage(ce),
-               ce->name);
+       if (!ce)
+               fprintf(o, "%s (missing)\n", label);
+       else
+               fprintf(o, "%s%06o %s %d\t%s\n",
+                       label,
+                       ntohl(ce->ce_mode),
+                       sha1_to_hex(ce->sha1),
+                       ce_stage(ce),
+                       ce->name);
 }
 #endif
 
@@ -453,6 +494,8 @@ static int threeway_merge(struct cache_entry **stages)
                verify_uptodate(index);
        }
 
+       nontrivial_merge = 1;
+
        /* #2, #3, #4, #6, #7, #9, #11. */
        count = 0;
        if (!head_match || !remote_match) {
@@ -576,7 +619,7 @@ static int read_cache_unmerged(void)
        return deleted;
 }
 
-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;
 
@@ -590,17 +633,29 @@ int main(int argc, char **argv)
        if (newfd < 0)
                die("unable to create new cachefile");
 
+       git_config(git_default_config);
+
        merge = 0;
        reset = 0;
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
-               /* "-u" means "update", meaning that a merge will update the working directory */
+               /* "-u" means "update", meaning that a merge will update
+                * the working tree.
+                */
                if (!strcmp(arg, "-u")) {
                        update = 1;
                        continue;
                }
 
+               /* "-i" means "index only", meaning that a merge will
+                * not even look at the working tree.
+                */
+               if (!strcmp(arg, "-i")) {
+                       index_only = 1;
+                       continue;
+               }
+
                /* This differs from "-m" in that we'll silently ignore unmerged entries */
                if (!strcmp(arg, "--reset")) {
                        if (stage || merge)
@@ -612,9 +667,9 @@ int main(int argc, char **argv)
                        continue;
                }
 
-               if (!strcmp(arg, "--head")) {
-                       head_idx = stage - 1;
-                       fn = threeway_merge;
+               if (!strcmp(arg, "--trivial")) {
+                       trivial_merges_only = 1;
+                       continue;
                }
 
                /* "-m" stands for "merge", meaning we start in stage 1 */
@@ -628,15 +683,20 @@ int main(int argc, char **argv)
                        continue;
                }
 
+               /* using -u and -i at the same time makes no sense */
+               if (1 < index_only + update)
+                       usage(read_tree_usage);
+
                if (get_sha1(arg, sha1) < 0)
                        usage(read_tree_usage);
                if (list_tree(sha1) < 0)
                        die("failed to unpack tree object %s", arg);
                stage++;
        }
-       if (update && !merge)
+       if ((update||index_only) && !merge)
                usage(read_tree_usage);
-       if (merge && !fn) {
+
+       if (merge) {
                if (stage < 2)
                        die("just how do you expect me to merge %d trees?", stage-1);
                switch (stage - 1) {
@@ -653,9 +713,7 @@ int main(int argc, char **argv)
                        fn = threeway_merge;
                        break;
                }
-       }
 
-       if (head_idx < 0) {
                if (stage - 1 >= 3)
                        head_idx = stage - 2;
                else