mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixed

Browse source
This commit is contained in:
Joey Hess 2012-06-23 10:27:04 -04:00
parent af5e6156ba
commit 325053e8de
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn
View file

@ -1,4 +1,18 @@
running 'git annex sync' doesn't merge the branches as expected (from the limited testing I have done) with git 1.7.10, the behaviour of merge has changed, it now asks for a commit message. I would expect setting _GIT_MERGE_AUTOEDIT=no_ should resolve this issue. running 'git annex sync' doesn't merge the branches as expected (from the
limited testing I have done) with git 1.7.10, the behaviour of merge has
changed, it now asks for a commit message. I would expect setting
_GIT_MERGE_AUTOEDIT=no_ should resolve this issue.
I had to manually do a merge (or set that variable) to get the branches back in sync again, this confused me a bit when git-annex watch was running in the background on a remote and it did not pick up the changes. I had to manually do a merge (or set that variable) to get the branches
back in sync again, this confused me a bit when git-annex watch was running
in the background on a remote and it did not pick up the changes.
> Yeah, I tend to miss these since the first thing I did when this
> misfeature was being posted was to write a mail discouraging them from
> doing it (sadly ignored), and then set in ~/.environment:
# My time is more valuable than git's new, bad default
GIT_MERGE_AUTOEDIT=no
export GIT_MERGE_AUTOEDIT
> Anyway, I've made sync run merge with --no-edit now. [[done]] --[[Joey]]