mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2006-05-05 17:50:06 -07:00
parent 86118bcb46
commit 09895c1fa0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
update-index.c
View File

@ -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 i;
int err = 0; int err = 0;
@ -588,7 +589,10 @@ static int do_unresolve(int ac, const char **av)
for (i = 1; i < ac; i++) { for (i = 1; i < ac; i++) {
const char *arg = av[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; return err;
} }
@ -704,7 +708,8 @@ int main(int argc, const char **argv)
break; break;
} }
if (!strcmp(path, "--unresolve")) { 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) if (has_errors)
active_cache_changed = 0; active_cache_changed = 0;
goto finish; goto finish;