Merge branch 'fixes'

diff --git a/read-tree.c b/read-tree.c
index fed2a3c544c0090d04175042fe5999d9c86bc1a9..6a5c08c4c6903fec45cbe37a63f0bc42fbae53bc 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -3,6 +3,8 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define DBRT_DEBUG 1
+
 #include "cache.h"
 
 #include "object.h"
@@ -10,6 +12,7 @@
 
 static int merge = 0;
 static int update = 0;
+static int index_only = 0;
 
 static int head_idx = -1;
 static int merge_size = 0;
@@ -47,8 +50,6 @@ static int entcmp(char *name1, int dir1, char *name2, int dir2)
        return ret;
 }
 
-#define DBRT_DEBUG 0
-
 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                            const char *base, merge_fn_t fn, int *indpos)
 {
@@ -101,14 +102,14 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        }
                }
 
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                if (first)
                        printf("index %s\n", first);
 #endif
                for (i = 0; i < len; i++) {
                        if (!posns[i] || posns[i] == &df_conflict_list)
                                continue;
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                        printf("%d %s\n", i + 1, posns[i]->name);
 #endif
                        if (!first || entcmp(first, firstdir,
@@ -188,7 +189,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        if (merge) {
                                int ret;
 
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                                printf("%s:\n", first);
                                for (i = 0; i < src_size; i++) {
                                        printf(" %d ", i);
@@ -200,7 +201,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
 #endif
                                ret = fn(src);
                                
-#if DBRT_DEBUG
+#if DBRT_DEBUG > 1
                                printf("Added %d entries\n", ret);
 #endif
                                *indpos += ret;
@@ -221,6 +222,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                        if (unpack_trees_rec(subposns, len, newbase, fn,
                                             indpos))
                                return -1;
+                       free(newbase);
                }
                free(subposns);
                free(src);
@@ -305,6 +307,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)
@@ -353,6 +358,22 @@ static int keep_entry(struct cache_entry *ce)
        return 1;
 }
 
+#if DBRT_DEBUG
+static void show_stage_entry(FILE *o,
+                            const char *label, const struct cache_entry *ce)
+{
+       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
+
 static int threeway_merge(struct cache_entry **stages)
 {
        struct cache_entry *index;
@@ -392,10 +413,10 @@ static int threeway_merge(struct cache_entry **stages)
        if (!same(remote, head)) {
                for (i = 1; i < head_idx; i++) {
                        if (same(stages[i], head)) {
-                               head_match = 1;
+                               head_match = i;
                        }
                        if (same(stages[i], remote)) {
-                               remote_match = 1;
+                               remote_match = i;
                        }
                }
        }
@@ -450,6 +471,13 @@ static int threeway_merge(struct cache_entry **stages)
                        }
                }
        }
+#if DBRT_DEBUG
+       else {
+               fprintf(stderr, "read-tree: warning #16 detected\n");
+               show_stage_entry(stderr, "head   ", stages[head_match]);
+               show_stage_entry(stderr, "remote ", stages[remote_match]);
+       }
+#endif
        if (head) { count += keep_entry(head); }
        if (remote) { count += keep_entry(remote); }
        return count;
@@ -555,7 +583,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;
 
@@ -574,12 +602,22 @@ int main(int argc, char **argv)
        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)
@@ -607,6 +645,10 @@ 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)