Skip to content

Commit

Permalink
fix 'git update-index --verbose --again' output
Browse files Browse the repository at this point in the history
'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>
  • Loading branch information
Karsten Blees authored and Junio C Hamano committed Nov 18, 2013
1 parent efc6842 commit e837af6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/update-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit e837af6

Please sign in to comment.