Git push from inside IDEA reconfigures (messes up) branch configuration

In any freshly cloned Git project, on command line, do `git config branch.master.merge`. Output should be:

    refs/heads/master

Now, do a commit, and then push from inside IDEA. Afterwards the same command outputs:

    master

From this point on, pushing and pulling will still work normally, both on commandline and from inside IDEA, but there are minor side-effects, like `git status` not showing the helpful "Your branch is ahead of 'origin/master' by 1 commit." message.

In order to repair the configuration, I have to do `git branch -u origin/master` (on older versions of git I think the syntax is `git branch --set-upstream master origin/master`).

IDEA will change the configuration back with every push.


Environment:
Tiny Maven project freshly imported into IDEA.

OSX 10.6.8

Leda version: 123.4 and 123.23
git version 1.8.0


git config -l (minus the uninteresting parts:)


apply.whitespace=nowarn
color.ui=auto
core.editor=/usr/bin/vim
diff.tool=diffmerge
difftool.prompt=false
difftool.diffmerge.cmd=diffmerge "$LOCAL" "$REMOTE"
merge.tool=diffmerge
mergetool.keepbackup=false
mergetool.diffmerge.cmd=diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
mergetool.diffmerge.trustexitcode=true
svn.rmdir=true
push.default=tracking
credential.helper=osxkeychain
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
core.precomposeunicode=false
remote.origin.url=git:sandbox/agnes
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master

Please sign in to leave a comment.