Git treats lines starting with #
as comment lines when committing. This is very annoying when working with a ticket tracking system, and trying to write the ticket number at the beginning of the line, e.g.
#123 salt hashed passwords
Git will simply remove the line from the commit message. Is there a way to escape the hash? I tried \
and !
, but nothing works. Whitespace before #
is prese开发者_开发百科rved, so that's not a working solution to the problem either.
This behaviour is part of git commit
's default 'clean-up' behaviour. If you want to keep lines starting with #
you can use an alternative clean-up mode.
E.g.
git commit --cleanup=whitespace
If you do this you have to be careful to remove all #
lines that you don't want to appear in the commit.
Note that, since git1.8.2 (February 2013), you can use a different character than '#
' for the commented line in the commit message.
That allows you to use '#
' for your bug number reference.
Various "hint" lines Git gives when it asks the user to edit messages in the editor are commented out with '
#
' by default.The
core.commentChar
configuration variable can be used to customize this '#
' to a different character.
In theory, you could put a core.commentChar
word (multiple characters), but git 2.0.x/2.1 will be stricter (Q3 2014).
See commit 50b54fd by Nguyễn Thái Ngọc Duy (pclouds
):
config: be strict on core.commentChar
We don't support comment strings (at least not yet). And multi-byte character encoding could also be misinterpreted.
The test with two commas is updated because it violates this. It's added with the patch that introduces
core.commentChar
in eff80a9 (Allow custom "comment char" - 2013-01-16). It's not clear to me why that behavior is wanted.
git 2.0.x/2.1 (Q3 2014) will add an automatic selection for core.commentChar
:
See commit 84c9dc2
When
core.commentChar
is "auto
", the comment char starts with '#
' as in default but if it's already in the prepared message, find another char in a small subset. This should stop surprises because git strips some lines unexpectedly.Note that git is not smart enough to recognize '
#
' as the comment char in custom templates and convert it if the final comment char is different.
It thinks '#' lines in custom templates as part of the commit message. So don't use this with custom templates.
The list of candidate characters for "auto" are:
# ; @ ! $ % ^ & | :
That means a command like git commit -m '#1 fixed issue'
will automatically switch the commentChar to ';
', because '#
' was used in the commit message.
Answers here are good and detailed, but for a git noob like me customizing git config options isn't so obvious. Here is an example to change from #
to ;
for comment characters:
git config core.commentChar ";"
That's all you need to do.
You can use the command line option -m
:
git commit -m "#123 fixed"
If you're doing an interactive rebase, then when you save your commit message with nothing in it (because the #
at the beginning has made it a comment and therefore it's been ignored) git will show you what to do:
Aborting commit due to empty commit message.
Could not amend commit after successfully picking 5e9159d9ce3a5c3c87a4fb7932fda4e53c7891db... 123 salt hashed passwords
This is most likely due to an empty commit message, or the pre-commit hook
failed. If the pre-commit hook failed, you may need to resolve the issue before
you are able to reword the commit.
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
So, just amend the message:
git commit --amend -m "#123 salt hashed passwords"
and continue the rebase:
git rebase --continue
git commit --cleanup=scissors
should be used. It's added to Git v2.0.0 on 2014.05.21
from git commit --help
--cleanup=<mode>
scissors
Same as whitespace, except that everything from (and including) the line
"# ------------------------ >8 ------------------------" is truncated if the message
is to be edited. "#" can be customized with core.commentChar.
It just suffices to start the commit message with a space char
just before the #
char.
Then git
stops regarding the line as a comment and github
can use the hashed ticket number without any problems.
vim
's default syntax highlighting even suggests the feature by changing the color from commentish to contentish.
All my commits starts with #issueNumber
so I put this boilerplate to my vim .git/hooks/commit-msg
:
NAME=$(git branch | grep '*' | sed 's/* //')
echo "$NAME"' '$(cat "$1") > "$1"
So let's suppose we have branch #15
and we make commit message add new awesome feature
. With this approach final commit message will be #15 add new awesome feature
.
Use a different prefix for the ticket number. Or prepend a word to the ticket number, like "Bug #42". Or prepend a single space character to the line; if you wish to remove that whitespace you can add a commit-hook for that.
I personally would rather not have this sort of commit message manipulation done by a hook because it can be very irritating when it triggers when you don't want it to. The easiest solution is probably to re-think the problem.
!
is a history expansion that's why it didn't worked.
History expansions are introduced by the appearance of the history expansion character, which is
!
by default.
You can use $
with single '
quotes (Escape a Single Quote in Single Quote String in Bash):
$ git commit -m $'#228 update to a new version! margin of error is 33% | 33^*0.22;'
# commit message: #228 update to a new version! margin of error is 33% | 33^*0.22;
$ git commit -m $'docs!: new API reference for GPS horse navigation'
# commit message: docs!: new API reference for GPS horse navigation
If used without $
and '
but with "
:
$ git commit -m "docs!: new API reference for GPS horse navigation"
bash: : unrecognized history modifier
If used with "
and escape \
(\
will still be there or I was doing something wrong):
$ git commit -m "docs\!: new API reference for GPS horse navigation"
# commit message: docs\!: new API reference for GPS horse navigation
精彩评论