From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Aug 2014, #01; Fri, 1)
Date: Wed, 06 Aug 2014 10:12:25 -0700 [thread overview]
Message-ID: <xmqq1tsto83q.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140806081102.GA1646@peff.net> (Jeff King's message of "Wed, 6 Aug 2014 04:11:02 -0400")
Jeff King <peff@peff•net> writes:
> On Fri, Aug 01, 2014 at 03:01:31PM -0700, Junio C Hamano wrote:
>
>> * jk/stash-list-p (2014-07-30) 7 commits
>> - SQUASH??? future-proof, log --cc should imply -p without being told
>> - stash: show combined diff with "stash show"
>> - stash: default listing to "--cc --simplify-combined-diff"
>> - add --simplify-combined-diff option
>> - pretty: make empty userformats truly empty
>> - pretty: treat "--format=" as an empty userformat
>> - revision: drop useless string offset when parsing "--pretty"
>>
>> Teach "git stash list -p" to DWIM to "git stash list -p --cc", with
>> even nicer twist to collapse combined diff from identical two
>> parents into a regular diff.
>
> What do you want to do with this topic?
>
> I think we want to drop the "stash show" patch, based on the discussion
> we had. The first three patches are nominally prep for that final
> patch, but actually are things I've often wanted over the years. I'd be
> glad if they made it in separately, but there were some compatibility
> questions.
I am not sure what compatibility you are worried about. The empty
format one looks like a pure bugfix to me, and I agree that they
are good changes regardless of the remainder of the series.
> As clever as I find the --simplify-combined-diff patch, I think we came
> to the conclusion that "--first-parent" is probably the reasonable
> choice. It matches "stash show", and it's simple and obvious. Do we just
> want a patch to specify "--first-parent" to stash-log? That would make
> "-p" just work. The only downside is that there isn't a good way to turn
> it off.
Perhaps we can add --no-first-parent to countermand it?
> Is it enough to say "if you want to do something clever, use
> git-log"?
> Or do we want to scrap the whole thing and try to update the
> documentation to make it more clear why "-p" by itself doesn't do
> anything?
The latter is the most conservative, but it may be too conservative
to be useful ;-). Unless we stop advertising that "stash list" is a
thin wrapper around "log -g" with options that would be useful to
view the stash, which is a strange ref with useful reflog entries,
the "--first-parent" approach would be the most sensible, I would
say. If we can dissociate "stash list" from "log" (in other words,
the set of options "stash list" takes does not have anything to do
with the underlying "log", even though both may have "-p" to tell
them to give patches, etc.), it would be a totally different matter,
and it might give us a better future, but I suspect it might be a
bit too late for that.
next prev parent reply other threads:[~2014-08-06 17:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 22:01 What's cooking in git.git (Aug 2014, #01; Fri, 1) Junio C Hamano
2014-08-06 8:11 ` Jeff King
2014-08-06 17:12 ` Junio C Hamano [this message]
2014-08-06 18:35 ` [PATCH] stash: default listing to working-tree diff Jeff King
2014-08-07 21:39 ` Junio C Hamano
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=xmqq1tsto83q.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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