From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 31 Jan 2007 13:34:17 +0000 (+0100)
Subject: Fix git-update-index to work with relative pathnames.
X-Git-Tag: v1.5.0-rc3~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ebe6cf953123ce904fe6930991694e3a3c79c17;p=git.git

Fix git-update-index to work with relative pathnames.

In particular, it fixes the following (typical for cygwin) problem:

    $ git-update-index --chmod=-x ../wrapper/Jamfile
    fatal: git-update-index: cannot chmod -x '../wrapper/Jamfile'

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 182331d34..1ac613a78 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -501,6 +501,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 
 	for (i = 1 ; i < argc; i++) {
 		const char *path = argv[i];
+		const char *p;
 
 		if (allow_options && *path == '-') {
 			if (!strcmp(path, "--")) {
@@ -616,9 +617,12 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 				usage(update_index_usage);
 			die("unknown option %s", path);
 		}
-		update_one(path, prefix, prefix_length);
+		p = prefix_path(prefix, prefix_length, path);
+		update_one(p, NULL, 0);
 		if (set_executable_bit)
-			chmod_path(set_executable_bit, path);
+			chmod_path(set_executable_bit, p);
+		if (p < path || p > path + strlen(path))
+			free((char*)p);
 	}
 	if (read_from_stdin) {
 		struct strbuf buf;