From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 2/8] apply: accept --threeway command line option
Date: Wed, 9 May 2012 23:02:19 -0700 [thread overview]
Message-ID: <1336629745-22436-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1336629745-22436-1-git-send-email-gitster@pobox.com>
This is the beginning of teaching the three-way merge fallback logic "git
am -3" uses to the underlying "git apply". It only implements the command
line parsing part, and does not do anything interesting yet.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/apply.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index fc7f07b..cb6aad5 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -46,6 +46,7 @@ static int apply_with_reject;
static int apply_verbosely;
static int allow_overlap;
static int no_add;
+static int threeway;
static const char *fake_ancestor;
static int line_termination = '\n';
static unsigned int p_context = UINT_MAX;
@@ -3024,6 +3025,11 @@ static void prepare_fn_table(struct patch *patch)
}
}
+static int try_threeway_fallback(struct image *image, struct patch *patch)
+{
+ return -1; /* for now */
+}
+
static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
{
struct strbuf buf = STRBUF_INIT;
@@ -3068,7 +3074,8 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
if (apply_fragments(&image, patch) < 0) {
/* Note: with --reject, the above call succeeds. */
- return -1;
+ if (!threeway || try_threeway_fallback(&image, patch) < 0)
+ return -1;
}
patch->result = image.buf;
patch->resultsize = image.len;
@@ -3981,6 +3988,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
"apply a patch without touching the working tree"),
OPT_BOOLEAN(0, "apply", &force_apply,
"also apply the patch (use with --stat/--summary/--check)"),
+ OPT_BOOL(0, "threeway", &threeway,
+ "attempt three-way merge if a patch does not apply"),
OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,
"build a temporary index based on embedded index information"),
{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
--
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 ` [PATCH 1/8] apply: reformat comment Junio C Hamano
2012-05-10 6:02 ` Junio C Hamano [this message]
2012-05-10 12:40 ` [PATCH 2/8] apply: accept --threeway command line option 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-3-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 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).