[ https://issues.apache.org/jira/browse/KAFKA-2328?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14631543#comment-14631543 ]
ASF GitHub Bot commented on KAFKA-2328: --------------------------------------- GitHub user ijuma opened a pull request: https://github.com/apache/kafka/pull/84 KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch 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. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ijuma/kafka kafka-2328-merge-script-no-detached-branch Alternatively you can review and apply these changes as the patch at: https://github.com/apache/kafka/pull/84.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #84 ---- commit ae201dd5ef934443fe11b98294f17b7ddd9d6d72 Author: Ismael Juma <ism...@juma.me.uk> Date: 2015-07-17T16:29:16Z KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch ---- > merge-kafka-pr.py script should not leave user in a detached branch > ------------------------------------------------------------------- > > Key: KAFKA-2328 > URL: https://issues.apache.org/jira/browse/KAFKA-2328 > Project: Kafka > Issue Type: Improvement > Reporter: Ismael Juma > Assignee: Ismael Juma > Priority: Minor > > [~gwenshap] asked: > "If I start a merge and cancel (say, by choosing 'n' when asked if I want to > proceed), I'm left on a detached branch. Any chance the script can put me > back in the original branch? or in trunk?" > Reference > https://issues.apache.org/jira/browse/KAFKA-2187?focusedCommentId=14621243&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14621243 -- This message was sent by Atlassian JIRA (v6.3.4#6332)