From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v4 14/19] apply: move verify_index_match() higher
Date: Tue, 10 Jul 2012 00:04:07 -0700 [thread overview]
Message-ID: <1341903852-4815-15-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1341903852-4815-1-git-send-email-gitster@pobox.com>
We will be adding another caller of this function in a later patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/apply.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index d84958b..682852c 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3074,6 +3074,16 @@ static struct patch *previous_patch(struct patch *patch, int *gone)
return previous;
}
+static int verify_index_match(struct cache_entry *ce, struct stat *st)
+{
+ if (S_ISGITLINK(ce->ce_mode)) {
+ if (!S_ISDIR(st->st_mode))
+ return -1;
+ return 0;
+ }
+ return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
+}
+
#define SUBMODULE_PATCH_WITHOUT_INDEX 1
static int load_patch_target(struct strbuf *buf,
@@ -3260,16 +3270,6 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
return 0;
}
-static int verify_index_match(struct cache_entry *ce, struct stat *st)
-{
- if (S_ISGITLINK(ce->ce_mode)) {
- if (!S_ISDIR(st->st_mode))
- return -1;
- return 0;
- }
- return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
-}
-
/*
* If "patch" that we are looking at modifies or deletes what we have,
* we would want it not to lose any local modification we have, either
--
1.7.11.1.294.g68a9409
next prev parent reply other threads:[~2012-07-10 7:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 7:03 [PATCH v4 00/19] "git apply --3way" Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 01/19] apply: fix an incomplete comment in check_patch() Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 02/19] apply: a bit more comments on PATH_TO_BE_DELETED Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 03/19] apply: clear_image() clears things a bit more Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 04/19] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 05/19] apply: factor out checkout_target() helper function Junio C Hamano
2012-07-10 7:03 ` [PATCH v4 06/19] apply: split load_preimage() helper function out Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 07/19] apply: refactor "previous patch" logic Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 08/19] apply: further split load_preimage() Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 09/19] apply: move check_to_create_blob() closer to its sole caller Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 10/19] apply: move "already exists" logic to check_to_create() Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 11/19] apply: accept -3/--3way command line option Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 12/19] apply: fall back on three-way merge Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 13/19] apply: plug the three-way merge logic in Junio C Hamano
2012-07-10 7:04 ` Junio C Hamano [this message]
2012-07-10 7:04 ` [PATCH v4 15/19] apply: --3way with add/add conflict Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 16/19] apply: register conflicted stages to the index Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 17/19] apply: allow rerere() to work on --3way results Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 18/19] apply: document --3way option Junio C Hamano
2012-07-10 7:04 ` [PATCH v4 19/19] apply: tests for the " 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=1341903852-4815-15-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).