X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=e3b9c0d9fa1cb5a03d1a3a08f992074293285904;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=ca808739dba4235f0f8a5777ff4bbfe4443d1d27;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git

diff --git a/read-tree.c b/read-tree.c
index ca808739..e3b9c0d9 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -13,6 +13,8 @@
 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;
@@ -235,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 = {
@@ -248,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) {
@@ -275,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;
 }
@@ -460,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) {
@@ -593,10 +629,14 @@ int main(int argc, char **argv)
 	unsigned char sha1[20];
 	merge_fn_t fn = NULL;
 
+	setup_git_directory();
+
 	newfd = hold_index_file_for_update(&cache_file, get_index_file());
 	if (newfd < 0)
 		die("unable to create new cachefile");
 
+	git_config(git_default_config);
+
 	merge = 0;
 	reset = 0;
 	for (i = 1; i < argc; i++) {
@@ -629,9 +669,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 */
@@ -657,7 +697,8 @@ int main(int argc, char **argv)
 	}
 	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) {
@@ -674,9 +715,7 @@ int main(int argc, char **argv)
 			fn = threeway_merge;
 			break;
 		}
-	}
 
-	if (head_idx < 0) {
 		if (stage - 1 >= 3)
 			head_idx = stage - 2;
 		else