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

comment

Browse source
This commit is contained in:
Joey Hess 2021-05-12 11:37:36 -04:00
parent afdc201d1c
commit 7e2fda5307
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
doc/bugs/OSX__58___Pushed_changes_are_autocommited/comment_3_8420ed892366eb78a874eec793eaa38d._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2021-05-12T15:26:00Z"
content="""
I do not think you need to reach for receive.denyCurrentBranch
to explain this behavior. The assistant runs git merge itself,
and is watching for changes to the working tree at the same time.
So it can get notifications of changes, that are made by git merge,
and commit them.
The result is that basically, any change that gets made to the work tree
while the assistant is running, can end up being recorded in a git commit.
Which is normally what you want and expect. In this case the change is
a file being removed breifly before being replaced with a new version.
Whether that is a bug is debatable, but it might be a good idea for the
assistant to at least pause committing while it's running a git merge.
The fact that it's committing files with merge conflict markers in them
is certianly a bug. I do wonder if that might be due to annex.resolvemerge
being configured to false; normally the assistant does not merge in a way
that would result in merge conflict markers ever appearing in the working
tree.
"""]]