Created
February 15, 2016 19:40
-
-
Save chrisrossi/f09c8bed70b364f9f12e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git init bug | |
cd bug | |
echo b > a | |
git add a | |
git commit -m "first commit" | |
echo > b | |
echo -n a >> b | |
git add b | |
git commit -m "second commit, first branch" | |
git checkout HEAD~1 | |
git checkout -b other | |
echo -n a > b | |
git add b | |
git commit -m "second commit, second branch" | |
git merge-tree HEAD~1 master other | |
cd .. | |
rm -rf bug |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
FWIW, even with the malloc error, the output of merge-tree is still correct and AcidFS still works as expected. You just get a nasty-gram to stderr.