From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH/WIP v3 10/31] am: refresh the index at start
Date: Thu, 18 Jun 2015 14:28:04 -0700 [thread overview]
Message-ID: <xmqqlhfgd7vf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1434626743-8552-11-git-send-email-pyokagan@gmail.com> (Paul Tan's message of "Thu, 18 Jun 2015 19:25:22 +0800")
Paul Tan <pyokagan@gmail.com> writes:
> If a file is unchanged but stat-dirty, git-apply may erroneously fail to
> apply patches, thinking that they conflict with a dirty working tree.
>
> As such, since 2a6f08a (am: refresh the index at start and --resolved,
> 2011-08-15), git-am will refresh the index before applying patches.
> Re-implement this behavior.
Good.
I would actually have expected to see this as part of 08/31, though.
>
> Signed-off-by: Paul Tan <pyokagan@gmail.com>
> ---
> builtin/am.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/builtin/am.c b/builtin/am.c
> index dfb6f7e..a7efe85 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -13,6 +13,7 @@
> #include "cache-tree.h"
> #include "refs.h"
> #include "commit.h"
> +#include "lockfile.h"
>
> /**
> * Returns 1 if the file is empty or does not exist, 0 otherwise.
> @@ -471,6 +472,20 @@ static const char *msgnum(const struct am_state *state)
> }
>
> /**
> + * Refresh and write index.
> + */
> +static void refresh_and_write_cache(void)
> +{
> + static struct lock_file lock_file;
> +
> + hold_locked_index(&lock_file, 1);
> + refresh_cache(REFRESH_QUIET);
> + if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
> + die(_("unable to write index file"));
> + rollback_lock_file(&lock_file);
> +}
> +
> +/**
> * Parses `patch` using git-mailinfo. state->msg will be set to the patch
> * message. state->author_name, state->author_email, state->author_date will be
> * set to the patch author's name, email and date respectively. The patch's
> @@ -607,6 +622,8 @@ static void do_commit(const struct am_state *state)
> */
> static void am_run(struct am_state *state)
> {
> + refresh_and_write_cache();
> +
> while (state->cur <= state->last) {
> const char *patch = am_path(state, msgnum(state));
>
> @@ -696,6 +713,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
>
> argc = parse_options(argc, argv, prefix, am_options, am_usage, 0);
>
> + if (read_index_preload(&the_index, NULL) < 0)
> + die(_("failed to read the index"));
> +
> if (am_in_progress(&state))
> am_load(&state);
> else {
next prev parent reply other threads:[~2015-06-18 21:28 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 11:25 [PATCH/WIP v3 00/31] Make git-am a builtin Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 01/31] wrapper: implement xopen() Paul Tan
2015-06-24 16:28 ` Johannes Schindelin
2015-06-24 16:59 ` Stefan Beller
2015-06-24 18:39 ` Johannes Schindelin
2015-07-01 9:41 ` Paul Tan
2015-07-01 9:53 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 02/31] wrapper: implement xfopen() Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 03/31] am: implement skeletal builtin am Paul Tan
2015-06-18 20:26 ` Junio C Hamano
2015-06-19 9:56 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 04/31] am: implement patch queue mechanism Paul Tan
2015-06-18 17:47 ` Stefan Beller
2015-06-18 20:43 ` Junio C Hamano
2015-06-19 12:49 ` Paul Tan
2015-06-24 14:59 ` Johannes Schindelin
2015-06-25 15:16 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 05/31] am: split out mbox/maildir patches with git-mailsplit Paul Tan
2015-06-18 20:52 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 06/31] am: detect mbox patches Paul Tan
2015-06-18 21:02 ` Junio C Hamano
2015-06-24 8:41 ` Paul Tan
2015-06-24 15:10 ` Johannes Schindelin
2015-06-25 13:40 ` Paul Tan
2015-06-26 7:42 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo Paul Tan
2015-06-18 21:10 ` Junio C Hamano
2015-06-19 9:22 ` Paul Tan
2015-06-19 16:13 ` Junio C Hamano
2015-06-24 7:54 ` Paul Tan
2015-06-24 15:59 ` Junio C Hamano
2015-06-25 11:54 ` Paul Tan
[not found] ` <CAPc5daVbpB_T4cY1xvLrBKPUZw0JNMXqNAOsKE-R7NPO2nrnZA@mail.gmail.com>
2015-06-19 16:15 ` Paul Tan
2015-06-19 20:12 ` Johannes Schindelin
2015-06-24 16:36 ` Johannes Schindelin
2015-06-26 8:11 ` Paul Tan
2015-06-26 20:41 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 08/31] am: apply patch with git-apply Paul Tan
2015-06-18 21:23 ` Junio C Hamano
2015-06-18 11:25 ` [PATCH/WIP v3 09/31] am: commit applied patch Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 10/31] am: refresh the index at start Paul Tan
2015-06-18 21:28 ` Junio C Hamano [this message]
2015-06-19 8:07 ` Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 11/31] am: refuse to apply patches if index is dirty Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 12/31] am: implement --resolved/--continue Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 13/31] am: implement --skip Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 14/31] am: implement --abort Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 15/31] am: don't accept patches when there's a session in progress Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 16/31] am: implement quiet option Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 17/31] am: exit with user friendly message on patch failure Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 18/31] am: implement am --signoff Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 19/31] cache-tree: introduce write_index_as_tree() Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 20/31] am: implement 3-way merge Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 21/31] am: --rebasing Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 22/31] am: don't use git-mailinfo if --rebasing Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 23/31] am: handle stray state directory Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 24/31] am: implement -k/--keep, --keep-non-patch Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 25/31] am: implement --[no-]message-id, am.messageid Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 26/31] am: support --keep-cr, am.keepcr Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 27/31] am: implement --[no-]scissors Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 28/31] am: pass git-apply's options to git-apply Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 29/31] am: implement --ignore-date Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 30/31] am: implement --committer-date-is-author-date Paul Tan
2015-06-18 11:25 ` [PATCH/WIP v3 31/31] am: implement -S/--gpg-sign, commit.gpgsign Paul Tan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlhfgd7vf.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 \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).