Skip to content

Instantly share code, notes, and snippets.

@chrisrossi
Created February 15, 2016 19:40
Show Gist options
  • Save chrisrossi/f09c8bed70b364f9f12e to your computer and use it in GitHub Desktop.
Save chrisrossi/f09c8bed70b364f9f12e to your computer and use it in GitHub Desktop.
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
@chrisrossi
Copy link
Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment