Comments (3)
My gut tells me that git_tracker is modifying the .git/EDIT_COMMIT_MSG
file which in turn causes git to fire up the $EDITOR
. Likely, git_tracker should NO-OP when source
is merge. See: http://book.git-scm.com/5_git_hooks.html
from git_tracker.
@alindeman I'm having trouble recreating this. Perhaps the issue was fixed by some changes I've made recently to fix a few other issues?
Can you try with the latest version, 1.2.0+, and see if its still happening? Hit me up in iChat the next time this thing bites you and we'll troubleshoot it together!
from git_tracker.
Well, shiiiiittt. Not a bug in git_tracker, it's a change in git 1.7.10.
From the release notes:
* From this release on, the "git merge" command in an interactive
session will start an editor when it automatically resolves the
merge for the user to explain the resulting commit, just like the
"git commit" command does when it wasn't given a commit message.
If you have a script that runs "git merge" and keeps its standard
input and output attached to the user's terminal, and if you do not
want the user to explain the resulting merge commits, you can
export GIT_MERGE_AUTOEDIT environment variable set to "no", like
this:
#!/bin/sh
GIT_MERGE_AUTOEDIT=no
export GIT_MERGE_AUTOEDIT
to disable this behavior (if you want your users to explain their
merge commits, you do not have to do anything). Alternatively, you
can give the "--no-edit" option to individual invocations of the
"git merge" command if you know everybody who uses your script has
Git v1.7.8 or newer.
Sorry for the bug report; it must have coincided with me upgrading git. I will probably be setting that environment variable, as modifying merge commit messages doesn't seem that useful to my current workflow.
from git_tracker.
Related Issues (17)
- Exit with non-zero status code if not in a .git repository. HOT 1
- Support for Ruby 1.8 HOT 1
- For consistency with other Git commands, use `init` instead of `install` HOT 1
- Commits break when git-tracker can't find the right Ruby HOT 3
- wrong number of arguments HOT 4
- git tracker init or git-tracker init ? HOT 5
- Cygwin? HOT 1
- Submodule support HOT 5
- Tower Support HOT 2
- "Ignoring debase" error HOT 6
- Support for other Tracking Systems HOT 5
- Exit with 0 status code when committing with existing commit. HOT 1
- Keywords in commit message should be case-insensitive
- Integration with Sprint.ly HOT 2
- Using the git-tracker hook breaks git rebase --interactive HOT 3
- Exception whenever I try to run git_tracker HOT 8
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git_tracker.