From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/8] apply: reformat comment
Date: Wed, 9 May 2012 23:02:18 -0700 [thread overview]
Message-ID: <1336629745-22436-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1336629745-22436-1-git-send-email-gitster@pobox.com>
With the "--reject" option, apply_fragments() can return 0, while marking
the fragment that was rejected as such, and there was a comment for that,
but it was stated rather poorly.
Update the comment and enclose it in a block, as this part will be getting
new code in later patches.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/apply.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 725712d..fc7f07b 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3066,8 +3066,10 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
img = strbuf_detach(&buf, &len);
prepare_image(&image, img, len, !patch->is_binary);
- if (apply_fragments(&image, patch) < 0)
- return -1; /* note with --reject this succeeds. */
+ if (apply_fragments(&image, patch) < 0) {
+ /* Note: with --reject, the above call succeeds. */
+ return -1;
+ }
patch->result = image.buf;
patch->resultsize = image.len;
add_to_fn_table(patch);
--
1.7.10.1.562.gfc79b1c
next prev parent reply other threads:[~2012-05-10 6:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 6:02 [PATCH 0/8] "git apply --threeway" Junio C Hamano
2012-05-10 6:02 ` Junio C Hamano [this message]
2012-05-10 6:02 ` [PATCH 2/8] apply: accept --threeway command line option Junio C Hamano
2012-05-10 12:40 ` Nguyen Thai Ngoc Duy
2012-05-10 15:31 ` Junio C Hamano
2012-05-10 6:02 ` [PATCH 3/8] apply: split load_preimage() helper function out Junio C Hamano
2012-05-10 6:02 ` [PATCH 4/8] apply: clear_image() clears things a bit more Junio C Hamano
2012-05-10 6:02 ` [PATCH 5/8] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-05-10 6:02 ` [PATCH 6/8] apply: fall back on three-way merge Junio C Hamano
2012-05-10 7:26 ` Matthieu Moy
2012-05-10 15:10 ` Junio C Hamano
2012-05-10 15:41 ` Matthieu Moy
2012-05-10 20:31 ` Jeff King
2012-05-10 21:06 ` Junio C Hamano
2012-05-10 22:24 ` Jeff King
2012-05-10 6:02 ` [PATCH 7/8] apply: plug the three-way merge logic in Junio C Hamano
2012-05-10 6:02 ` [PATCH 8/8] apply: register conflicted stages to the index Junio C Hamano
2012-05-10 7:31 ` [PATCH 0/8] "git apply --threeway" Matthieu Moy
2012-05-10 15:26 ` 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=1336629745-22436-2-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.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.