diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-12 22:00:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-12 22:00:02 -0400 |
| commit | 923c253078e6e82aeaf6226a19cace6a53701d94 (patch) | |
| tree | c53f5d4fc73f3d20ad37fec0c830e75199a6fa60 /doc/bugs/direct_mode_merge_interrupt.mdwn | |
| parent | fd2b8cf2a99170b15b35c9895710983f5481ba46 (diff) | |
work around a bug in git
http://marc.info/?l=git&m=140262402204212&w=2
This git bug manifested on FAT and Windows as the test suite failing in 3
places. All involved merge conflict resolution. It turned out that the
associated file mappings were getting messed up, and that happened because
this git bug lost track of what files were supposed to be symlinks.
This commit was sponsored by Eric Kidd.
Diffstat (limited to 'doc/bugs/direct_mode_merge_interrupt.mdwn')
| -rw-r--r-- | doc/bugs/direct_mode_merge_interrupt.mdwn | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/bugs/direct_mode_merge_interrupt.mdwn b/doc/bugs/direct_mode_merge_interrupt.mdwn index e64848140..7cbb44208 100644 --- a/doc/bugs/direct_mode_merge_interrupt.mdwn +++ b/doc/bugs/direct_mode_merge_interrupt.mdwn @@ -32,8 +32,16 @@ merge. (I assume this is how `git merge` normally works.) --[[Joey]] > Seems that a direct mode > merge also needs to use a different index file to stage its changes? > (Ugh) -> > [[done]] --[[Joey]] -> +> > done --[[Joey]] + +> > > I had to revert the fix on FAT/Windows due to +> > > a git bug: <http://marc.info/?l=git&m=140262402204212&w=2> +> > > Once that bug's fixed, I can revisit this. --[[Joey]] + +[[!meta title="direct mode merge interrupt (fixed for all except FAT, Windows)"]] + +## other options + > Or could perhaps use `git-merge-tree` > and avoid staging the merge in the index until the work-tree is updated. > |