diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-12 21:16:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:02 -0700 |
| commit | e09837e25d50cba97ffcc2934801dbd861e4276d (patch) | |
| tree | 55afe3ea997ad2fad503d628d42648b0b2957709 | |
| parent | apply: plug the three-way merge logic in (diff) | |
| download | tgif-e09837e25d50cba97ffcc2934801dbd861e4276d.tar.xz | |
apply: move verify_index_match() higher
We will be adding another caller of this function in a later patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/apply.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index d84958b596..682852c716 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 |