projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d2527c4) | patch
sync: Fix bug in adjusted branch merging that could cause recently added files to...
authorJoey Hess <joeyh@joeyh.name>
Mon, 10 Oct 2016 19:00:45 +0000 (15:00 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 10 Oct 2016 19:00:45 +0000 (15:00 -0400)
commitb82c3e0783c5ef97fdcc928e811605bcc285adc0
tree564fd1c4c6b4bfaeaeb9edb4d93cb942f6c85649tree | snapshot
parentd2527c421c6f619a44bf161fd0266d645d7355cccommit | diff
sync: Fix bug in adjusted branch merging that could cause recently added files to be lost when updating the adjusted branch.

The modification flag was not being set when making modifications deep
in a tree, so parent trees were not updated to contain the modified tree.

Seems to have exposed another bug where the wrong filename gets grafted in.

This commit was sponsored by Brock Spratlen on Patreon.
CHANGELOG diff | blob | history
Git/Tree.hs diff | blob | history
doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.