From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Stefan Beller <sbeller@google.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
Date: Wed, 19 Aug 2015 10:55:20 -0700 [thread overview]
Message-ID: <xmqqy4h79n93.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150819082222.GA27685@potato.chippynet.com> (Paul Tan's message of "Wed, 19 Aug 2015 16:22:22 +0800")
Paul Tan <pyokagan@gmail.com> writes:
> (In addition, I fixed a small mistake with the "struct tree_desc" array
> size.)
Yeah, one thing I forgot to mention was that I suspect this kind of
"oneway merge" already in other places in the code, and a future
mini-project might be to inspect them all and try to see if their
commonalities can be taken advantage of. If we had a small helper
function to do the "do the equivalent of 'git reset $TREE'", this
miscounting wouldn't have happened.
The change looks sensible. Thanks.
prev parent reply other threads:[~2015-08-19 17:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-16 19:46 "git am --abort" screwing up index? Linus Torvalds
2015-08-16 23:33 ` Linus Torvalds
2015-08-17 8:01 ` Johannes Schindelin
2015-08-17 9:48 ` [PATCH] am --abort: merge ORIG_HEAD tree into index Paul Tan
2015-08-17 10:09 ` Johannes Schindelin
2015-08-17 14:54 ` Linus Torvalds
2015-08-17 19:33 ` Junio C Hamano
2015-08-19 8:22 ` [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD " Paul Tan
2015-08-19 17:55 ` 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=xmqqy4h79n93.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pyokagan@gmail.com \
--cc=sbeller@google.com \
--cc=torvalds@linux-foundation.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.