From: David Aguilar <davvid@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
bill lam <cbill.lam@gmail.com>, git <git@vger.kernel.org>
Subject: Re: [PATCH v2] status: list unmerged files last
Date: Wed, 2 Sep 2009 18:12:36 -0700 [thread overview]
Message-ID: <20090903011234.GA7415@gmail.com> (raw)
In-Reply-To: <20090902175908.GA5998@coredump.intra.peff.net>
On Wed, Sep 02, 2009 at 01:59:08PM -0400, Jeff King wrote:
> On Wed, Sep 02, 2009 at 03:07:32AM -0700, David Aguilar wrote:
>
> > I agree with all of this but would also add that we can have
> > our cake and eat it too with respect to wanting to "keep
> > similar things together" and having "unmerged near bottom".
>
> Well, my point was that the "bottom" is not really cake, but I am not
> sure anyone else agrees.
>
> > No one has suggested this, so I figured I would.
> > What do you think about this layout?
> >
> > - untracked
> > - staged
> > - modified
> > - unmerged
>
> What about the current branch? Alternate author info? Tracking branch
> relationship? Should those be at the top or bottom?
>
> I dunno. Maybe it is just me being crotchety and hating change, but I
> like the current order (though swapping it below "updated" is fine with
> me).
Nah, you're right.
Being crotchety and hating change is a good thing here.
> If you want to know "what does commit --amend do", then shouldn't you be
> using "git commit --amend --dry-run" (which is what "git status" is now,
> but will not be in v1.7.0)?
>
> Are there other uses cases for arbitrary tree-ish's?
>
> > BTW is status -s intended to be something plumbing-like;
> > something we can build upon and expect to be stable?
> > I'm just curious because other commands have a --porcelain
> > option and I wasn't sure if this was the intent.
>
> We mentioned a --porcelain option in other discussion, but I don't think
> there is a patch. I would be in favor of --porcelain, even if it is
> currently identical to --short, because then it gives us freedom to
> diverge later (and in particular it gives us the freedom to let user
> configuration affect what is shown).
>
> -Peff
The only use case would be for --amend.
Which is why I asked about --porcelain; really what I want is
something like
git status --porcelain HEAD^
Rolling a patch to make --porcelain an alias for --short seems
like a good idea. If we want to support HEAD^ and HEAD^ only
then perhaps an --amend flag is useful.
The real crux of my question was about being able to script
it, which is why commit --dry-run is not enough.
--
David
next prev parent reply other threads:[~2009-09-03 1:12 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-01 14:52 unmerged files listed in the beginning of git-status bill lam
2009-09-01 16:42 ` Junio C Hamano
2009-09-01 19:40 ` Johannes Sixt
2009-09-01 20:13 ` [PATCH] status: list unmerged files after staged files Johannes Sixt
2009-09-01 20:38 ` Junio C Hamano
2009-09-01 21:25 ` [PATCH v2] status: list unmerged files last Johannes Sixt
2009-09-02 0:18 ` Junio C Hamano
2009-09-02 0:39 ` bill lam
2009-09-02 1:15 ` Jeff King
2009-09-02 4:26 ` Junio C Hamano
2009-09-02 5:12 ` Jeff King
2009-09-02 5:26 ` Junio C Hamano
2009-09-02 5:28 ` Jeff King
2009-09-02 10:07 ` David Aguilar
2009-09-02 17:59 ` Jeff King
2009-09-03 1:12 ` David Aguilar [this message]
2009-09-05 6:28 ` Jeff King
2009-09-05 8:48 ` Jeff King
2009-09-05 8:50 ` [PATCH/RFC 1/6] status: typo fix in usage Jeff King
2009-09-05 8:52 ` [PATCH/RFC 2/6] docs: note that status configuration affects only long format Jeff King
2009-09-06 8:04 ` Junio C Hamano
2009-09-05 8:53 ` [PATCH/RFC 3/6] status: refactor short-mode printing to its own function Jeff King
2009-09-06 8:05 ` Junio C Hamano
2009-09-05 8:54 ` [PATCH/RFC 4/6] status: refactor format option parsing Jeff King
2009-09-05 8:55 ` [PATCH/RFC 5/6] status: add --porcelain output format Jeff King
2009-09-05 8:59 ` [PATCH/RFC 6/6] commit: support alternate status formats Jeff King
2009-09-05 9:08 ` [PATCH v2] status: list unmerged files last Jeff King
2009-09-02 19:19 ` Johannes Sixt
2009-09-02 12:48 ` Mark Brown
2009-09-02 18:00 ` Jeff King
2009-09-02 18:39 ` Mark Brown
2009-09-05 9:04 ` Jeff King
2009-09-05 11:39 ` Mark Brown
2009-09-02 9:04 ` unmerged files listed in the beginning of git-status bill lam
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=20090903011234.GA7415@gmail.com \
--to=davvid@gmail.com \
--cc=cbill.lam@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
/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).