From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Michael Rappazzo" <rappazzo@gmail.com>
Subject: Re: [PATCH v3 0/2] Fix bugs in rev-parse's output when run in a subdirectory
Date: Fri, 17 Feb 2017 10:25:34 -0800 [thread overview]
Message-ID: <xmqq8tp4u129.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <cover.1487350582.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Fri, 17 Feb 2017 17:58:53 +0100 (CET)")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> The bug that bit me (hard!) and that triggered not only a long series of
> curses but also my writing a patch and sending it to the list was that
> `git rev-parse --git-path HEAD` would give *incorrect* output when run
> in a subdirectory of a regular checkout, but *correct* output when run
> in a subdirectory of an associated *worktree*.
>
> I had tested the script in question quite a bit, but in a worktree. And
> in production, it quietly did exactly the wrong thing.
>
> Changes relative to v2:
>
> - the "iffy" test in t1700 was made "uniffy"
>
> - clarified in the commit message of 2/2 why we can get away with the
> "reset then use" pattern
It is no longer relevant between "reset then use" and "use then
reset", I think, because you did something much better, which is to
move strbuf_release() up so that it comes before the possible early
returns.
Both patches look good. Let's queue this and move it to 'next'
shortly. Personally, I think it is OK to fast-track this to
'master' before the final, but just like any other bugs, we've lived
with the bug for some time, and it is not a big deal if we have to
live with it for a bit longer.
Thanks.
prev parent reply other threads:[~2017-02-17 18:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 12:17 [PATCH] rev-parse --git-path: fix output when running in a subdirectory Johannes Schindelin
2017-02-08 18:47 ` Junio C Hamano
2017-02-09 21:05 ` Johannes Schindelin
2017-02-09 21:50 ` Junio C Hamano
2017-02-10 4:21 ` Jeff King
2017-02-09 9:48 ` Duy Nguyen
2017-02-09 13:46 ` Mike Rappazzo
2017-02-09 21:11 ` Johannes Schindelin
2017-02-09 21:33 ` Junio C Hamano
2017-02-09 22:11 ` Johannes Schindelin
2017-02-09 22:54 ` Junio C Hamano
2017-02-10 3:52 ` Mike Rappazzo
2017-02-10 15:44 ` Johannes Schindelin
2017-02-10 15:33 ` [PATCH v2 0/2] Fix bugs in rev-parse's output when run " Johannes Schindelin
2017-02-10 15:33 ` [PATCH v2 1/2] rev-parse tests: add tests executed from " Johannes Schindelin
2017-02-10 18:50 ` Junio C Hamano
2017-02-17 16:55 ` Johannes Schindelin
2017-02-10 20:25 ` Junio C Hamano
2017-02-17 16:57 ` Johannes Schindelin
2017-02-10 15:33 ` [PATCH v2 2/2] rev-parse: fix several options when running in " Johannes Schindelin
2017-02-10 18:57 ` Junio C Hamano
2017-02-17 16:53 ` Johannes Schindelin
2017-02-10 18:59 ` [PATCH v2 0/2] Fix bugs in rev-parse's output when run " Junio C Hamano
2017-02-17 16:58 ` [PATCH v3 " Johannes Schindelin
2017-02-17 16:59 ` [PATCH v3 1/2] rev-parse tests: add tests executed from " Johannes Schindelin
2017-02-17 16:59 ` [PATCH v3 2/2] rev-parse: fix several options when running in " Johannes Schindelin
2017-02-17 18:25 ` 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=xmqq8tp4u129.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
--cc=rappazzo@gmail.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 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.