From: Junio C Hamano <gitster@pobox.com>
To: Elijah Conners <business@elijahpepe.com>
Cc: "git" <git@vger.kernel.org>, "hanwen" <hanwen@google.com>
Subject: Re: [PATCH v2] reftable: use a pointer for pq_entry param
Date: Thu, 15 Sep 2022 11:01:50 -0700 [thread overview]
Message-ID: <xmqq1qsco6sx.fsf@gitster.g> (raw)
In-Reply-To: <1833f3928cb.acf3c97d869879.7909589521159235166@elijahpepe.com> (Elijah Conners's message of "Wed, 14 Sep 2022 20:37:34 -0700")
Hmph. I do not know what went wrong. Somebody between your "git
format-patch" and the mailing list archive ate tabs and spitted out
spaces, it seems. I'll try to fix it up.
Thanks.
$ git am -s ./+ec
.git/rebase-apply/patch:13: indent with spaces.
.rec = rec,
.git/rebase-apply/patch:14: indent with spaces.
.index = i,
.git/rebase-apply/patch:15: indent with spaces.
};
.git/rebase-apply/patch:17: indent with spaces.
merged_iter_pqueue_add(&mi->pq, &e);
.git/rebase-apply/patch:18: indent with spaces.
}
error: patch failed: reftable/merged.c:36
error: reftable/merged.c: patch does not apply
error: patch failed: reftable/pq.c:71
error: reftable/pq.c: patch does not apply
error: patch failed: reftable/pq_test.c:46
error: reftable/pq_test.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: reftable: use a pointer for pq_entry param
Patch failed at 0001 reftable: use a pointer for pq_entry param
next prev parent reply other threads:[~2022-09-15 18:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 3:37 [PATCH v2] reftable: use a pointer for pq_entry param Elijah Conners
2022-09-15 18:01 ` Junio C Hamano [this message]
2022-09-15 20:19 ` Elijah Conners
2022-09-15 20:42 ` 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=xmqq1qsco6sx.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=business@elijahpepe.com \
--cc=git@vger.kernel.org \
--cc=hanwen@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.
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 NNTP newsgroup(s).