我正在为 Windows 中的 git-flow 自动化编写一个 Bash 脚本。
问题是:当我调用git flow release finish MYRELEASE -m "MESSAGE"
时从 cmd 运行它不需要输入(期望的行为)。但是当我从 Git Bash (MINGW64) 执行相同操作时,它会要求 merge 消息(启动 vim),这是我想避免的。
我尝试将 git-config 设置为 git config --global core.mergeoptions --no-edit
在两个控制台中,但结果是相同的:Git Bash 总是要求 merge 消息。
- 为什么控制台的行为有所不同?
- 如何让 Git Bash 停止请求 merge 消息?
更新:
git flow release finish 1.1.4 -m "v1.1.4" --showcommands
的输出在两个控制台中都是
git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
git merge --no-ff release/1.1.4
Already up-to-date!
Merge made by the 'recursive' strategy.
git tag -a -m v1.1.4 1.1.4 1.1.4
git checkout develop
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
git merge --no-ff 1.1.4
Already up-to-date!
Merge made by the 'recursive' strategy.
git branch -d release/1.1.4
Deleted branch release/1.1.4 (was 0a774fe).
Summary of actions:
- Release branch 'release/1.1.4' has been merged into 'master'
- The release was tagged '1.1.4'
- Release tag '1.1.4' has been back-merged into 'develop'
- Release branch 'release/1.1.4' has been locally deleted
- You are now on branch 'develop'
最佳答案
我刚刚在相关question的答案中自己找到了解决方案.
您所要做的就是在脚本开头执行 export GIT_MERGE_AUTOEDIT=no
并在脚本结尾处unset GIT_MERGE_AUTOEDIT
。
我仍然不知道为什么两个控制台有所不同,但此修复产生了所需的行为,因此对我来说已经足够了。
关于git flow release finish -m 在 cmd 和 Git Bash 中给出不同的行为,我们在Stack Overflow上找到一个类似的问题: https://stackoverflow.com/questions/39876749/