mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid running pre-commit hook in direct mode

Browse source 
The code that handles committing unlocked files in indirect mode did
something unexpected and data lossy.
This commit is contained in:
Joey Hess 2013-01-17 14:11:01 -04:00
parent 9cee5b43c2
commit 7272179979
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/PreCommit.hs
View file

@ -20,7 +20,7 @@ def = [command "pre-commit" paramPaths seek "run by git pre-commit hook"]
seek :: [CommandSeek] seek :: [CommandSeek]
seek = seek =
[ whenNotDirect $ withFilesToBeCommitted $ whenAnnexed $ Command.Fix.start [ whenNotDirect $ withFilesToBeCommitted $ whenAnnexed $ Command.Fix.start
, withFilesUnlockedToBeCommitted start] , whenNotDirect $ withFilesUnlockedToBeCommitted start]
start :: FilePath -> CommandStart start :: FilePath -> CommandStart
start file = next $ perform file start file = next $ perform file

7
doc/bugs/Possible_data_loss_-_git_status___39__typechange__39___and_direct_mode.mdwn
View file

@ -24,4 +24,9 @@ OS: OSX 10.6.8
#### Please provide any additional information below. #### Please provide any additional information below.
> This was the pre-commit hook, made it not run in direct mode. [[done]]
>
> However, it's normal to see typechanged files in direct mode, and many
> git commands that manipulate files in the working tree *can* result in
> data loss. This is documented on [[direct_mode]].
> --[[Joey]]