Skip to content

Commit 9bbcc18

Browse files
authored
Merge pull request #10 from hfagerlund/bugfix/correct-changeset-number
Fix commit hash in Trac link
2 parents 2b3fb04 + bfd2082 commit 9bbcc18

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,12 @@ $ ./acceptanceTests.sh
116116
**Note**: make sure that [shunit2](https://github.com/kward/shunit2) has been added to your `$PATH`.
117117
- - -
118118
## License
119-
Copyright (c) Heini Fagerlund. Licensed under the [MIT license](http://opensource.org/licenses/mit-license.php).
119+
Copyright (c) 2015 Heini Fagerlund. Licensed under the [MIT license](http://opensource.org/licenses/mit-license.php).
120120
(See [LICENSE](https://github.com/hfagerlund/git-add-msg/blob/master/LICENSE).)
121121

122122
- - -
123123
## Changelog
124+
* 0.2.1 - January 28, 2018. Fixed display of changeset number in auto-generated Trac link.
124125
* 0.2.0 - January 13, 2016. Deprecated (optional) git status check.
125126
* 0.1.4 - December 30, 2015. Fixed display of ticket update message.
126127
* 0.1.3 - December 30, 2015. Newlines in multi-line commit messages now display in Changelog file.

git-add-msg

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
# * (Trac users) run using -r option to automatically add comments, with links to changesets in specified repository, in Trac tickets.
1515
#
1616
# author: Heini Fagerlund
17-
# version: 0.2.0
17+
# version: 0.2.1
1818
# license: MIT
1919
#
20-
# Copyright (c) Heini Fagerlund
20+
# Copyright (c) 2015 Heini Fagerlund
2121
#
2222
# Permission is hereby granted, free of charge, to any person obtaining a copy
2323
# of this software and associated documentation files (the "Software"), to deal
@@ -85,14 +85,11 @@ while :
8585
do
8686
printf "Enter your commit message (without quote marks; press ctrl-d when done):\n"
8787
mymultimsg=$(cat)
88-
multimsg="${mymultimsg}"
88+
8989
if [ ! -z "$mymultimsg" -a "$mymultimsg" != " " ]; then
9090
printf "git committing...\n"
9191
git add .
92-
git commit -F- <<MSG
93-
$multimsg
94-
MSG
95-
git log --decorate -1 | xclip
92+
git commit -am "#$ticketnum: $mymultimsg" | xclip
9693
changeset=$( xclip -o )
9794

9895
changeset=${changeset%\]*}

trac-service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# Use with git-add-msg to log git commits to Trac using its XML-RPC API
44
#
55
# author: Heini Fagerlund
6-
# version: 0.2.0
6+
# version: 0.2.1
77
# license: MIT
88
#
99
# The MIT License (MIT)
1010
# [OSI Approved License]
1111
#
1212
# The MIT License (MIT)
1313
#
14-
# Copyright (c) Heini Fagerlund
14+
# Copyright (c) 2015 Heini Fagerlund
1515
#
1616
# Permission is hereby granted, free of charge, to any person obtaining a copy
1717
# of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)