diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-10 12:54:21 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-10 12:56:21 -0400 |
| commit | 6616f48e2b1cb17bc700cf47272c467fef00b217 (patch) | |
| tree | 0d73a8b7a2d0a21438f373663d693fdd2d30ee06 | |
| parent | fcf005f4221d9e97979f486200d3446d207010ea (diff) | |
reproduce recipe
| -rw-r--r-- | doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn | 22 |
1 files changed, 21 insertions, 1 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 b00e499b9..72ca49061 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 @@ -27,4 +27,24 @@ running `git annex sync` on an adjusted branch. Possible smoking gun? Initial plan: Try to reset the adjusted branch and master back to before 9cdbd4f, and re-run to try to reproduce this happening. ---[[Joey]] +--[[Joey]] + +> Update: Was able to reproduce bug as follows: + +1. Untar tarball +2. git reset --hard 961bbbf +3. git cherry-pick 9cdbd4f +4. git annex sync + +Output of step #4 is: + + On branch adjusted/master(unlocked) + nothing to commit, working tree clean + ok + merge synced/master (Merging into master...) Already up-to-date. + (Merging into adjusted branch...) + Updating 61bf677..46e18b7 + Fast-forward + (diffstat shows 1 file added, and all files from commit 9cdbd4f deleted) + +--[[Joey]] |