From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: [PATCH] Correction to git-p4 "exclude" change
Date: Thu, 05 Feb 2015 11:05:28 -0800 [thread overview]
Message-ID: <xmqq1tm4mb5z.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAE5ih7-Eo9uNCRQHO8bOGCuE0w8U_S4q+aYTNfttSHLQM6GVpA@mail.gmail.com> (Luke Diamand's message of "Thu, 5 Feb 2015 08:24:12 +0000")
Luke Diamand <luke@diamand.org> writes:
> (Resending as plain text).
>
> I could be wrong about this, but my correction above doesn't seem to
> be in 'next'. Does that mean (reading your last "what's cooking") that
> the broken version is going to go out to 'master' soon?
The current copy of "What's cooking" I have reads like so:
* ld/p4-exclude-in-sync (2015-01-28) 2 commits
- git-p4: correct "exclude" change
(merged to 'next' on 2015-01-22 at f6f1fc7)
+ git-p4: support excluding paths on sync
Will squash into one after 2.3 final.
As we are too late to merge anything new to 'master', and the broken
one is not in 'master', I have been playing lazy to make time to
tend to other issues ;-) After 2.3 final, we would rewind the tip
of 'next' and will rebuild, and when that happens, I am hoping that
we can make these two into one commit that does not have the "oops,
I forgot a comma and broke the entire command" fix-up as a separate
commit.
Or did I mis-read you? Do we have broken code already in 'master'
that this hot-fix needs to be applied to unbreak?
prev parent reply other threads:[~2015-02-05 19:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 6:08 [PATCH] Correction to git-p4 "exclude" change Luke Diamand
2015-01-28 6:08 ` [PATCH] git-p4: correct " Luke Diamand
2015-01-28 20:49 ` [PATCH] Correction to git-p4 " Junio C Hamano
[not found] ` <CAE5ih7_TJOQ=ttw03V3J9A=jtwUD-Emy-mSp0kNrYKkqMs30ng@mail.gmail.com>
2015-02-05 8:24 ` Luke Diamand
2015-02-05 19:05 ` Junio C Hamano [this message]
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=xmqq1tm4mb5z.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.