mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Git
History
Joey Hess d6711800ad avoid bad commits after interrupted direct mode sync (or merge) 
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.

Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.

This commit was sponsored by Tony Cantor.
2014-06-09 19:40:28 -04:00
..
AutoCorrect.hs Another round of s/amoung/among/ 2013-12-19 12:30:53 -04:00
Branch.hs avoid bad commits after interrupted direct mode sync (or merge) 2014-06-09 19:40:28 -04:00
BuildVersion.hs better git version checking 2013-08-02 18:32:26 -04:00
CatFile.hs Windows: Fix some filename encoding bugs. 2014-03-19 15:57:56 -04:00
CheckAttr.hs fix off-by-one 2013-10-16 12:14:14 -04:00
CheckIgnore.hs gitignore support for the assistant and watcher 2013-08-02 20:37:03 -04:00
Command.hs fix all remaining -Wall warnings on Windows 2014-02-25 14:48:50 -04:00
Config.hs Fix bug that broke switching between local repositories in the webapp when they use the new guarded direct mode. 2013-11-22 23:27:15 -04:00
Construct.hs Windows: Fix handling of absolute unix-style git repository paths. 2014-02-08 15:39:04 -04:00
CurrentRepo.hs avoid more build warnings on Windows 2013-08-04 14:05:36 -04:00
DiffTree.hs avoid bad commits after interrupted direct mode sync (or merge) 2014-06-09 19:40:28 -04:00
FileMode.hs more completely solve catKey memory leak 2013-09-19 16:41:21 -04:00
Filename.hs handle C-style escapes in Format 2011-12-23 01:05:16 -04:00
FilePath.hs Windows: Fix handling of absolute unix-style git repository paths. 2014-02-08 15:39:04 -04:00
Fsck.hs fully fix fsck memory use by iterative fscking 2014-03-12 15:18:43 -04:00
GCrypt.hs support gcrypt remotes (assuming them to be over ssh transport) 2014-04-08 16:16:46 -04:00
HashObject.hs add git annex view command 2014-02-18 18:22:20 -04:00
Hook.hs pre-commit-annex hook script to automatically extract metadata from lots of types of files 2014-03-02 20:11:58 -04:00
Index.hs avoid bad commits after interrupted direct mode sync (or merge) 2014-06-09 19:40:28 -04:00
LsFiles.hs status: Ignore new files that are gitignored. 2013-12-12 14:01:24 -04:00
LsTree.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
Merge.hs avoid bad commits after interrupted direct mode sync (or merge) 2014-06-09 19:40:28 -04:00
Objects.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
Queue.hs couple more warning fixes 2014-02-25 14:53:43 -04:00
Ref.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
RefLog.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
Remote.hs webapp: Improve UI around remote that have no annex.uuid set, either because setup of them is incomplete, or because the remote git repository is not a git-annex repository. 2013-11-07 18:02:00 -04:00
Repair.hs fully fix fsck memory use by iterative fscking 2014-03-12 15:18:43 -04:00
Sha.hs filter branches (incomplete) 2014-02-16 17:39:54 -04:00
SharedRepository.hs Support git's core.sharedRepository configuration 2012-04-21 15:36:52 -04:00
Types.hs adjust to not use cpp in modules used by configure 2014-04-14 13:37:12 -04:00
UnionMerge.hs union merge bugfix 2013-01-16 21:31:06 -04:00
UpdateIndex.hs improved direct mode dir/file conflicted merge resultion, using tree grafting 2014-03-04 15:00:19 -04:00
Url.hs map: Work when there are gcrypt remotes. 2013-11-04 14:14:44 -04:00
Version.hs better git version checking 2013-08-02 18:32:26 -04:00