git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [RFC/PATCH 1/2] status -s: respect the status.relativePaths option
Date: Thu, 26 Nov 2009 16:24:38 +0100	[thread overview]
Message-ID: <62c5bb36940485deefbf73f4bdc3fd45bbea069e.1259248243.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <cover.1259248243.git.git@drmicha.warpmail.net>

so that 'status' and 'status -s' in a subdir produce the same file
names.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Anything else would be highly surprising. Note that the porcelain case
is unchanged, of course.

 builtin-commit.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/builtin-commit.c b/builtin-commit.c
index 7f888fe..c103beb 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -1113,6 +1113,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:
-- 
1.6.6.rc0.274.g71380

  reply	other threads:[~2009-11-26 15:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-26 15:24 [RFC/PATCH 0/2] status -s: Use the same config as status Michael J Gruber
2009-11-26 15:24 ` Michael J Gruber [this message]
2009-11-27  3:15   ` [RFC/PATCH 1/2] status -s: respect the status.relativePaths option Junio C Hamano
2009-11-27  7:05   ` Jeff King
2009-11-26 15:24 ` [RFC/PATCH 2/2] status -s: obey color.status Michael J Gruber
2009-11-26 15:36   ` Johannes Sixt
2009-11-26 16:03     ` Michael J Gruber
2009-11-26 19:00     ` Junio C Hamano
2009-11-27  7:00       ` [PATCH] Add a notice that only certain functions can print color escape codes Johannes Sixt
2009-11-27  7:30         ` Junio C Hamano
2009-11-27  7:42           ` Johannes Sixt
2009-11-27  9:22             ` Michael J Gruber
2009-11-27  5:15   ` [RFC/PATCH 2/2] status -s: obey color.status Junio C Hamano
2009-11-27  9:17     ` Michael J Gruber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=62c5bb36940485deefbf73f4bdc3fd45bbea069e.1259248243.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).