From: Victoria Dye <vdye@xxxxxxxxxx>
Update the stat info of the moved index entry in 'rename_index_entry_at()'
if the entry is up-to-date with the index. Internally, 'git mv' uses
'rename_index_entry_at()' to move the source index entry to the destination.
However, it directly copies the stat info of the original cache entry, which
will not reflect the 'ctime' of the file renaming operation that happened as
part of the move. If a file is otherwise up-to-date with the index, that
difference in 'ctime' will make the entry appear out-of-date until the next
index-refreshing operation (e.g., 'git status').
Some commands, such as 'git reset', use the cached stat information to
determine whether a file is up-to-date; if this information is incorrect,
the command will fail when it should pass. In order to ensure a moved entry
is evaluated as 'up-to-date' when appropriate, refresh the destination index
entry's stat info in 'git mv' if and only if the file is up-to-date.
Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
'ctime' of the file creation will be definitively older than the 'ctime' of
the renamed file in 'git mv'.
Reported-by: Maximilian Reichel <reichemn@xxxxxxxxxx>
Signed-off-by: Victoria Dye <vdye@xxxxxxxxxx>
---
mv: refresh stat info for moved entry
This patch fixes a bug [1] encountered when executing 'git reset --merge
HEAD' immediately after 'git mv'. Because the stat info of the original
entry is copied to the new one, including all cached stat information,
the 'ctime' isn't updated corresponding to the rename. If the index
entry is otherwise up-to-date with the contents on-disk, the incorrect
'ctime' makes subsequent operations (e.g., 'git reset --merge') identify
the index entry as out-of-date, failing when they should succeed.
Note, however, that we use 'refresh_cache_entry()' to refresh the stat
information rather than 'fill_stat_cache_info()' directly because the
stat information should only be updated if the index entry is up-to-date
with the file on-disk. If we ignored this distinction, the stat info
would match the state of unstaged changes on-disk, not the entry in the
index as it should.
To avoid exiting 'git mv' with a stale index that may affect subsequent
commands, 'rename_index_entry_at()' (used internally by 'git mv') is
updated to refresh the destination index entry's stat information after
the move is complete.
[1]
https://lore.kernel.org/git/84FF8F9A-3A9A-4F2A-8D8E-5D50F2F06203@xxxxxxxxxx/
Changes since V1
================
* Determined the exact cause of the failure (the mismatched 'ctime'),
as well as the reasoning for why the stat information cannot always
be updated; revised the implementation accordingly.
* Fixed usage of 'refresh_cache_entry()'; because it does not update
cache entries in-place, insert its return value into the index (if
valid), and discard the no-longer-needed 'new_entry' cache entry.
* Updated the test for the bug report scenario to wait long enough such
that the 'ctime' of the 'mv' is distinct from the original file
creation time.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1187%2Fvdye%2Freset%2Fmerge-inconsistency-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1187/vdye/reset/merge-inconsistency-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1187
Range-diff vs v1:
1: fe9f5f0d8ec ! 1: bde58070eda mv: refresh stat info for moved entry
@@ Metadata
## Commit message ##
mv: refresh stat info for moved entry
- Add 'refresh_cache_entry()' after moving the index entry in
- 'rename_index_entry_at()'. Internally, 'git mv' uses
- 'rename_index_entry_at()' to move the source index entry to the destination,
- overwriting the old entry if '-f' is specified. However, it does not refresh
- the stat information on destination index entry, making its 'CE_UPTODATE'
- flag out-of-date until the index is refreshed (e.g., by 'git status').
+ Update the stat info of the moved index entry in 'rename_index_entry_at()'
+ if the entry is up-to-date with the index. Internally, 'git mv' uses
+ 'rename_index_entry_at()' to move the source index entry to the destination.
+ However, it directly copies the stat info of the original cache entry, which
+ will not reflect the 'ctime' of the file renaming operation that happened as
+ part of the move. If a file is otherwise up-to-date with the index, that
+ difference in 'ctime' will make the entry appear out-of-date until the next
+ index-refreshing operation (e.g., 'git status').
- Some commands, such as 'git reset', assume the 'CE_UPTODATE' information
- they read from the index is accurate, and use that information to determine
- whether the operation can be done successfully or not. In order to ensure
- the index is correct for commands such as these, explicitly refresh the
- destination index entry in 'git mv' before exiting.
+ Some commands, such as 'git reset', use the cached stat information to
+ determine whether a file is up-to-date; if this information is incorrect,
+ the command will fail when it should pass. In order to ensure a moved entry
+ is evaluated as 'up-to-date' when appropriate, refresh the destination index
+ entry's stat info in 'git mv' if and only if the file is up-to-date.
+
+ Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
+ 'ctime' of the file creation will be definitively older than the 'ctime' of
+ the renamed file in 'git mv'.
Reported-by: Maximilian Reichel <reichemn@xxxxxxxxxx>
Signed-off-by: Victoria Dye <vdye@xxxxxxxxxx>
## read-cache.c ##
+@@ read-cache.c: static void replace_index_entry(struct index_state *istate, int nr, struct cache
+
+ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
+ {
+- struct cache_entry *old_entry = istate->cache[nr], *new_entry;
++ struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
+ int namelen = strlen(new_name);
+
+ new_entry = make_empty_cache_entry(istate, namelen);
@@ read-cache.c: void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
+ cache_tree_invalidate_path(istate, old_entry->name);
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
-+ refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
+- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
++
++ /*
++ * Refresh the new index entry. Using 'refresh_cache_entry' ensures
++ * we only update stat info if the entry is otherwise up-to-date (i.e.,
++ * the contents/mode haven't changed). This ensures that we reflect the
++ * 'ctime' of the rename in the index without (incorrectly) updating
++ * the cached stat info to reflect unstaged changes on disk.
++ */
++ refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
++ if (refreshed && refreshed != new_entry) {
++ add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
++ discard_cache_entry(new_entry);
++ } else
++ add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
@@ t/t7001-mv.sh: test_description='git mv in subdirs'
+
+ echo foo >foo &&
+ git add foo &&
++
++ # Wait one second to ensure ctime of rename will differ from original
++ # file creation ctime.
++ sleep 1 &&
+ git mv -f foo bar &&
-+ git reset --merge HEAD
++ git reset --merge HEAD &&
++
++ # Verify the index has been reset
++ git diff-files >out &&
++ test_must_be_empty out
+'
+
test_expect_success 'prepare reference tree' '
read-cache.c | 17 +++++++++++++++--
t/t7001-mv.sh | 19 +++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 3e0e7d41837..4df97e185e9 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -134,7 +134,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
- struct cache_entry *old_entry = istate->cache[nr], *new_entry;
+ struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
int namelen = strlen(new_name);
new_entry = make_empty_cache_entry(istate, namelen);
@@ -147,7 +147,20 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
cache_tree_invalidate_path(istate, old_entry->name);
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+
+ /*
+ * Refresh the new index entry. Using 'refresh_cache_entry' ensures
+ * we only update stat info if the entry is otherwise up-to-date (i.e.,
+ * the contents/mode haven't changed). This ensures that we reflect the
+ * 'ctime' of the rename in the index without (incorrectly) updating
+ * the cached stat info to reflect unstaged changes on disk.
+ */
+ refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
+ if (refreshed && refreshed != new_entry) {
+ add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+ discard_cache_entry(new_entry);
+ } else
+ add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 963356ba5f9..a402908142d 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,6 +4,25 @@ test_description='git mv in subdirs'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-data.sh
+test_expect_success 'mv -f refreshes updated index entry' '
+ echo test >bar &&
+ git add bar &&
+ git commit -m test &&
+
+ echo foo >foo &&
+ git add foo &&
+
+ # Wait one second to ensure ctime of rename will differ from original
+ # file creation ctime.
+ sleep 1 &&
+ git mv -f foo bar &&
+ git reset --merge HEAD &&
+
+ # Verify the index has been reset
+ git diff-files >out &&
+ test_must_be_empty out
+'
+
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
COPYING_test_data >path0/COPYING &&
base-commit: abf474a5dd901f28013c52155411a48fd4c09922
--
gitgitgadget
