mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
status -s: respect the status.relativePaths option
Otherwise, 'status' and 'status -s' in a subdir would produce different names. This change is all the more important because status.relativePaths is on by default. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
46b77a6b48
commit
482a6c1061
|
@ -114,8 +114,8 @@ compatibility) and `color.status.<slot>` configuration variables
|
|||
to colorize its output.
|
||||
|
||||
If the config variable `status.relativePaths` is set to false, then all
|
||||
paths shown in the long format are relative to the repository root, not
|
||||
to the current directory.
|
||||
paths shown are relative to the repository root, not to the current
|
||||
directory.
|
||||
|
||||
If `status.submodulesummary` is set to a non zero number or true (identical
|
||||
to -1 or an unlimited number), the submodule summary will be enabled for
|
||||
|
|
|
@ -1059,6 +1059,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|||
|
||||
switch (status_format) {
|
||||
case STATUS_FORMAT_SHORT:
|
||||
if (s.relative_paths)
|
||||
s.prefix = prefix;
|
||||
short_print(&s, null_termination);
|
||||
break;
|
||||
case STATUS_FORMAT_PORCELAIN:
|
||||
|
|
Loading…
Reference in a new issue