undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: keep gently check inside add_rejected_path

Browse Source 
This basically follows the footsteps of 6a143aa2b2 (checkout -m:
attempt merge when deletion of path was staged - 2014-08-12) where
there gently check is moved inside reject_merge() so that callers do
not accidentally forget it.

add_rejected_path() has the same usage pattern. All call sites check
gently first, then decide to call add_rejected_path() if needed. Move
the check inside.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2019-03-22 16:31:35 +07:00 committed by Junio C Hamano
parent 041f5ea1cf
commit 191e9d2c2d
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
unpack-trees.c
View File

@ -219,6 +219,9 @@ static int add_rejected_path(struct unpack_trees_options *o,
enum unpack_trees_error_types e, enum unpack_trees_error_types e,
const char *path) const char *path)
{ {
if (o->gently)
return -1;
if (!o->show_all_errors) if (!o->show_all_errors)
return error(ERRORMSG(o, e), super_prefixed(path)); return error(ERRORMSG(o, e), super_prefixed(path));
@ -268,8 +271,7 @@ static int check_submodule_move_head(const struct cache_entry *ce,
flags |= SUBMODULE_MOVE_HEAD_FORCE; flags |= SUBMODULE_MOVE_HEAD_FORCE;
if (submodule_move_head(ce->name, old_id, new_id, flags)) if (submodule_move_head(ce->name, old_id, new_id, flags))
return o->gently ? -1 : return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
return 0; return 0;
} }
@ -1645,8 +1647,7 @@ return_failed:
static int reject_merge(const struct cache_entry *ce, static int reject_merge(const struct cache_entry *ce,
struct unpack_trees_options *o) struct unpack_trees_options *o)
{ {
return o->gently ? -1 : return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
} }
static int same(const struct cache_entry *a, const struct cache_entry *b) static int same(const struct cache_entry *a, const struct cache_entry *b)
@ -1693,8 +1694,7 @@ static int verify_uptodate_1(const struct cache_entry *ce,
int r = check_submodule_move_head(ce, int r = check_submodule_move_head(ce,
"HEAD", oid_to_hex(&ce->oid), o); "HEAD", oid_to_hex(&ce->oid), o);
if (r) if (r)
return o->gently ? -1 : return add_rejected_path(o, error_type, ce->name);
add_rejected_path(o, error_type, ce->name);
return 0; return 0;
} }
@ -1712,8 +1712,7 @@ static int verify_uptodate_1(const struct cache_entry *ce,
} }
if (errno == ENOENT) if (errno == ENOENT)
return 0; return 0;
return o->gently ? -1 : return add_rejected_path(o, error_type, ce->name);
add_rejected_path(o, error_type, ce->name);
} }
int verify_uptodate(const struct cache_entry *ce, int verify_uptodate(const struct cache_entry *ce,
@ -1835,8 +1834,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
d.exclude_per_dir = o->dir->exclude_per_dir; d.exclude_per_dir = o->dir->exclude_per_dir;
i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL); i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
if (i) if (i)
return o->gently ? -1 : return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
free(pathbuf); free(pathbuf);
return cnt; return cnt;
} }
@ -1905,8 +1903,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
return 0; return 0;
} }
return o->gently ? -1 : return add_rejected_path(o, error_type, name);
add_rejected_path(o, error_type, name);
} }
/* /*