From: Junio C Hamano <junkio@cox.net>
Date: Sat, 6 May 2006 00:50:06 +0000 (-0700)
Subject: update-index --unresolve: work from a subdirectory.
X-Git-Tag: v1.4.0-rc1~169
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09895c1fa02f77acb2bde3d7e9da675eeb1271cf;p=git.git

update-index --unresolve: work from a subdirectory.

It completely forgot to take the prefix into account, so you
had to feed the full path even when you start from a
subdirectory, which was nonsensical.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/update-index.c b/update-index.c
index 9fa3d2bb9..1870ac796 100644
--- a/update-index.c
+++ b/update-index.c
@@ -576,7 +576,8 @@ static void read_head_pointers(void)
 	}
 }
 
-static int do_unresolve(int ac, const char **av)
+static int do_unresolve(int ac, const char **av,
+			const char *prefix, int prefix_length)
 {
 	int i;
 	int err = 0;
@@ -588,7 +589,10 @@ static int do_unresolve(int ac, const char **av)
 
 	for (i = 1; i < ac; i++) {
 		const char *arg = av[i];
-		err |= unresolve_one(arg);
+		const char *p = prefix_path(prefix, prefix_length, arg);
+		err |= unresolve_one(p);
+		if (p != arg)
+			free((char*)p);
 	}
 	return err;
 }
@@ -704,7 +708,8 @@ int main(int argc, const char **argv)
 				break;
 			}
 			if (!strcmp(path, "--unresolve")) {
-				has_errors = do_unresolve(argc - i, argv + i);
+				has_errors = do_unresolve(argc - i, argv + i,
+							  prefix, prefix_length);
 				if (has_errors)
 					active_cache_changed = 0;
 				goto finish;