From 325053e8de109329eac31017271134b1c5faef04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Jun 2012 10:27:04 -0400 Subject: [PATCH] fixed --- ...nd_now_asks_for_a_commit_message__34__.mdwn | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn b/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn index 2dd7e51b16..05024ffe9f 100644 --- a/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn +++ b/doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn @@ -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]]