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

avoid making post-merge-conflict-resolution commit when no conflicts were resolved

Browse source 
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.
This commit is contained in:
Joey Hess 2015-10-15 14:22:46 -04:00
parent 238728362f
commit 27eaa6f410
Failed to extract signature
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -36,6 +36,12 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
* Avoid unncessary write to the location log when a file is unlocked
and then added back with unchanged content.
* S3: Fix support for using https.
* 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.
* Debian: Add torrent library to build-depends as it's packaged now,
and stop recommending bittornado | bittorrent.
* Debian: Remove dependency on transformers library, as it is now