brew update - opens vi, asks for a commit msg

[2bits]

Using git 1.7.10 and executing brew update, instead of just doing update, it opens up vi and asks me for a commit message,

Merge branch 'master' of https://github.com/mxcl/homebrew

Is it me or just me?

[jacknagel]

Git 1.7.10 changed the behavior of git merge and by extension git pull; non-fast-forward merges now always spawn the commit message editor. Most people will never see it because git pull will fast-forward when master hasn't diverged from upstream.

There is an environment variable we can export during brew update to suppress it.

[2bits]

Thanks for the info.

[ghost]

@jacknagel I'm constantly bumping into this issue. Setting GIT_MERGE_AUTOEDIT just before the pull didn't seem to work either. The only solution which worked for me was:
git config --add branch.master.mergeoptions --no-edit but I'm not sure whether this is wise...

[jacknagel]

Sorry, I completely lost track of this. Either of

$ GIT_MERGE_AUTOEDIT=no brew update

or

$ export GIT_MERGE_AUTOEDIT=no
$ brew update

should work, but I'll see about setting this in brew update.