Skip to content

G
git2
Commit c214ba19 by Edward Thomson
Options

checkout: respect core.filemode when comparing filemodes 

Fixes #4504
parent 275693e2
Showing with 21 additions and 13 deletions
src/checkout.c
...@@ -70,6 +70,7 @@ typedef struct { ...@@ -70,6 +70,7 @@ typedef struct {
git_buf tmp; git_buf tmp;
unsigned int strategy; unsigned int strategy;
int can_symlink; int can_symlink;
int respect_filemode;
bool reload_submodules; bool reload_submodules;
size_t total_steps; size_t total_steps;
size_t completed_steps; size_t completed_steps;
...@@ -159,17 +160,20 @@ GIT_INLINE(bool) is_workdir_base_or_new( ...@@ -159,17 +160,20 @@ GIT_INLINE(bool) is_workdir_base_or_new(
git_oid__cmp(&newitem->id, workdir_id) == 0); git_oid__cmp(&newitem->id, workdir_id) == 0);
} }
GIT_INLINE(bool) is_file_mode_changed(git_filemode_t a, git_filemode_t b) GIT_INLINE(bool) is_filemode_changed(git_filemode_t a, git_filemode_t b, int respect_filemode)
{ {
#ifdef GIT_WIN32 /* If core.filemode = false, ignore links in the repository and executable bit changes */
/* if (!respect_filemode) {
* On Win32 we do not support the executable bit; the file will if (a == S_IFLNK)
* always be 0100644 on disk, don't bother doing a test. a = GIT_FILEMODE_BLOB;
*/ if (b == S_IFLNK)
return false; b = GIT_FILEMODE_BLOB;
#else
return (S_ISREG(a) && S_ISREG(b) && a != b); a &= ~0111;
#endif b &= ~0111;
}
return (a != b);
} }
static bool checkout_is_workdir_modified( static bool checkout_is_workdir_modified(
...@@ -217,11 +221,11 @@ static bool checkout_is_workdir_modified( ...@@ -217,11 +221,11 @@ static bool checkout_is_workdir_modified(
if (ie != NULL && if (ie != NULL &&
git_index_time_eq(&wditem->mtime, &ie->mtime) && git_index_time_eq(&wditem->mtime, &ie->mtime) &&
wditem->file_size == ie->file_size && wditem->file_size == ie->file_size &&
!is_file_mode_changed(wditem->mode, ie->mode)) { !is_filemode_changed(wditem->mode, ie->mode, data->respect_filemode)) {
/* The workdir is modified iff the index entry is modified */ /* The workdir is modified iff the index entry is modified */
return !is_workdir_base_or_new(&ie->id, baseitem, newitem) || return !is_workdir_base_or_new(&ie->id, baseitem, newitem) ||
is_file_mode_changed(baseitem->mode, ie->mode); is_filemode_changed(baseitem->mode, ie->mode, data->respect_filemode);
} }
/* depending on where base is coming from, we may or may not know /* depending on where base is coming from, we may or may not know
...@@ -234,7 +238,7 @@ static bool checkout_is_workdir_modified( ...@@ -234,7 +238,7 @@ static bool checkout_is_workdir_modified(
if (S_ISDIR(wditem->mode)) if (S_ISDIR(wditem->mode))
return false; return false;
if (is_file_mode_changed(baseitem->mode, wditem->mode)) if (is_filemode_changed(baseitem->mode, wditem->mode, data->respect_filemode))
return true; return true;
if (git_diff__oid_for_entry(&oid, data->diff, wditem, wditem->mode, NULL) < 0) if (git_diff__oid_for_entry(&oid, data->diff, wditem, wditem->mode, NULL) < 0)
...@@ -2454,6 +2458,10 @@ static int checkout_data_init( ...@@ -2454,6 +2458,10 @@ static int checkout_data_init(
&data->can_symlink, repo, GIT_CVAR_SYMLINKS)) < 0) &data->can_symlink, repo, GIT_CVAR_SYMLINKS)) < 0)
goto cleanup; goto cleanup;
if ((error = git_repository__cvar(
&data->respect_filemode, repo, GIT_CVAR_FILEMODE)) < 0)
goto cleanup;
if (!data->opts.baseline && !data->opts.baseline_index) { if (!data->opts.baseline && !data->opts.baseline_index) {
data->opts_free_baseline = true; data->opts_free_baseline = true;
error = 0; error = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment