projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2387283) | patch
avoid making post-merge-conflict-resolution commit when no conflicts were resolved
authorJoey Hess <joeyh@joeyh.name>
Thu, 15 Oct 2015 18:22:46 +0000 (14:22 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 15 Oct 2015 18:22:46 +0000 (14:22 -0400)
commit27eaa6f41096fa6262df9a05b74f8c63754f17fd
tree81623fc3aa57b8e04daf7484eb3a8cf0efedb9a4tree | snapshot
parent238728362fea6e92430f264363aabd1eb796436fcommit | diff
avoid making post-merge-conflict-resolution commit when no conflicts were resolved

sync, merge, assistant: When git merge failed for a reason other than a
conflicted merge, such as a crippled filesystem not allowing particular
characters in filenames, git-annex would make a merge commit that could
omit such files or otherwise be bad. Fixed by aborting the whole merge
process when git merge fails for any reason other than a merge conflict.
Annex/AutoMerge.hs diff | blob | history
Annex/Direct.hs diff | blob | history
debian/changelog diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.