summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Karsten Blees <karsten.blees@gmail.com>2013-11-14 20:23:42 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-18 13:04:25 -0800
commite837af61345344448346afef79d53a5ff95bb0b3 (patch)
tree2ae0e3a1bc36cd09d5c4ce3afe580d2213aff770
parentremove old hash.[ch] implementation (diff)
downloadtgif-e837af61345344448346afef79d53a5ff95bb0b3.tar.xz
fix 'git update-index --verbose --again' output
'git update-index --verbose' consistently reports paths relative to the work-tree root. The only exception is the '--again' option, which reports paths relative to the current working directory. Change do_reupdate to use non-prefixed paths. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/update-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index e3a10d706d..d180d80c04 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -579,7 +579,7 @@ static int do_reupdate(int ac, const char **av,
* or worse yet 'allow_replace', active_nr may decrease.
*/
save_nr = active_nr;
- update_one(ce->name + prefix_length, prefix, prefix_length);
+ update_one(ce->name, NULL, 0);
if (save_nr != active_nr)
goto redo;
}