summaryrefslogtreecommitdiff
path: root/doc/bugs/direct_mode_renames.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-02-05 17:45:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-02-05 17:45:53 -0400
commit018e4240e6ea4a0fcd5f37135bfaf08803ddbffc (patch)
tree8da43e4d7367324e4f5c7138b1265027c43a8bb5 /doc/bugs/direct_mode_renames.mdwn
parent4b690643b335b8892a0fb3b8cb05b7b50f987a36 (diff)
update
Diffstat (limited to 'doc/bugs/direct_mode_renames.mdwn')
-rw-r--r--doc/bugs/direct_mode_renames.mdwn13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/bugs/direct_mode_renames.mdwn b/doc/bugs/direct_mode_renames.mdwn
index 788c615dc..d0c7a8b30 100644
--- a/doc/bugs/direct_mode_renames.mdwn
+++ b/doc/bugs/direct_mode_renames.mdwn
@@ -1,10 +1,13 @@
When in direct mode, renaming a file with `git mv` does not update the
-direct mode mapping to use the new filename. This can lead to unexpected
-behavior later. `fsck` will correct the mapping. --[[Joey]]
+direct mode mapping to use the new filename. --[[Joey]]
+
+Consistency checks now prevent anything bad happening when the mapping file
+contains old filenames. Still, missing the new filename will prevent that
+file working properly in direct mode.
Perhaps the pre-commit hook needs to update the mapping for files that were
-deleted or added. This would allow manual `git mv` (and `git rm`) to work.
+deleted or added.
-This also affects moves of files when the assistant is being used.
+(This also affects moves of files when the assistant is being used.
In this case, the assistant updates the mapping to add the new name,
-but does not delete the old name from the mapping.
+but does not delete the old name from the mapping.)