Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix captain push -Bc when on tag #86

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

jwliechty
Copy link
Contributor

@jwliechty jwliechty commented May 17, 2019

Addresses #86

When checked out on a tag and pushing all branches, captain failed to
remove (HEAD detached at v1.0) from the git branch output. It then
tried to tag a docker container with that text of which docker would
(rightly so) error out. The changes in this commit remove this
extraneous text from the docker label list when on a commit not marked by
a branch. In addition, only branches whose heads point to the current HEAD
are considered, as opposed to all branches that contain the HEAD commit.
Tests were added to git_test.go on a git repository to verify it
behaved properly whether the current HEAD commit is pointed at by tags or
branches, just tags, or just branches.

Please accept and create a new distributable. Thanks!

Merge original repo master
When checked out on a tag and pushing all branches, captain failed to
remove `(HEAD detached at v1.0)` from the `git branch` output. It then
tried to tag a docker container with that text of which docker would
(rightly so) error out. The changes in this commit remove this
extraneous text from the docker label list when on a commit not marked by
a branch. In addition, only branches whose heads point to the current HEAD
are considered, as opposed to all branches that contain the HEAD commit.
Tests were added to `git_test.go` on a git repository to verify it
behaved properly whether the current HEAD commit is pointed at by tags or
branches, just tags, or just branches.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant