diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2009-11-26 16:24:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-26 19:15:57 -0800 |
| commit | 482a6c106132bea454bf839f458c014f84ddbd99 (patch) | |
| tree | c1cf24d8d06bb8b4818da82d81b39fcf88a87e57 | |
| parent | 46b77a6b487fceeeb297a9473631939aefd7e6fd (diff) | |
| download | git-482a6c106132bea454bf839f458c014f84ddbd99.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-status.txt | 4 | ||||
| -rw-r--r-- | builtin-commit.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 58d35fb3c2..b3dfa42cc0 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -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 diff --git a/builtin-commit.c b/builtin-commit.c index f2fd0a4580..f49b598cbd 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -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: |