This fix should be fine for Linux and OS X. Not sure about Windows though. This is a very specific fix for new functionality added in KAFKA-2384. There are other places where a similar error could occur, but are less likely.
The script doesn't really support Unicode input at the moment.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang
Closes#109 from ijuma/kafka-2384-hotfix and squashes the following commits:
0ab8958 [Ismael Juma] Encode/decode to utf-8 for commit title IO in kafka-merge-pr.py
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang
Closes#105 from ijuma/kafka-2384-override-commit-message-title and squashes the following commits:
e042242 [Ismael Juma] Support overriding of commit message title in kafka-merge-pr.py
The first 4 commits are adapted from changes that have been done to the Spark version and the last one is the feature that gwenshap asked for.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Gwen Shapira <cshapi@gmail.com>
Closes#90 from ijuma/kafka-2344-merge-pr-improvements and squashes the following commits:
900c371 [Ismael Juma] Allow reviewers to be entered during merge
ac06347 [Ismael Juma] Allow primary author to be overridden during merge
b309829 [Ismael Juma] Set JIRA resolution to "Fixed" instead of relying on default transition
0c69a64 [Ismael Juma] Check return value of doctest.testmod()
061cdce [Ismael Juma] Fix instructions on how to install the `jira-python` library
The right command to get the branch name is `git rev-parse --abbrev-ref HEAD` instead of `git rev-parse HEAD`. The latter gives the commit hash causing a detached branch when we checkout to it. Seems like a bug we inherited from the Spark script.
Author: Ismael Juma <ismael@juma.me.uk>
Closes#84 from ijuma/kafka-2328-merge-script-no-detached-branch and squashes the following commits:
ae201dd [Ismael Juma] KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch
Added unit tests as well. These fail without the fix, but pass with the fix.
Author: Geoff Anderson <geoff@confluent.io>
Closes#73 from granders/KAFKA-2327 and squashes the following commits:
52a2085 [Geoff Anderson] Cleaned up unecessary toString calls
23b3340 [Geoff Anderson] Fixes KAFKA-2327
Ismael Juma
Geoff Anderson