diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-10 14:23:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-10 14:23:24 -0400 |
| commit | d1ff850120eabe57248f6d3b2948551ce61c26df (patch) | |
| tree | 6c0f432634c9e0c1e985761eae3460cb775da86c | |
| parent | 6616f48e2b1cb17bc700cf47272c467fef00b217 (diff) | |
more analysis
| -rw-r--r-- | doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn b/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn index 72ca49061..8c4425f8b 100644 --- a/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn +++ b/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn @@ -29,7 +29,9 @@ Initial plan: Try to reset the adjusted branch and master back to before 9cdbd4f and re-run to try to reproduce this happening. --[[Joey]] -> Update: Was able to reproduce bug as follows: +---- + +Update: Was able to reproduce bug as follows: 1. Untar tarball 2. git reset --hard 961bbbf @@ -45,6 +47,14 @@ Output of step #4 is: (Merging into adjusted branch...) Updating 61bf677..46e18b7 Fast-forward - (diffstat shows 1 file added, and all files from commit 9cdbd4f deleted) + (diffstat shows 1 file added, and all files added by commit 9cdbd4f deleted) + +Making changes other than that cherry-pick, like adding or renaming +a file, don't seem to trigger the bug. + +I think that the bug is in Git.Tree.adjustTree, when the +addtreeitems are in a deep subdirectory, it seems to not be adding them +into the tree. This happens in simpler test cases, so something about +this particular tree is breaking the code. --[[Joey]] |