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

git-flow: prefer "-f" readlink(1) option to "-e" #12

Merged
merged 1 commit into from
Jul 3, 2023

Conversation

ChrisJStone
Copy link
Member

This is a re submission of PR 469
Since $0 can be assumed to exist, these two flags behave identially, but readlink(1) from busybox does not support "-e", only GNU Coreutils does.

Since $0 can be assumed to exist, these two flags behave identially, but
readlink(1) from busybox does not support "-e", only GNU Coreutils does.
@ChrisJStone ChrisJStone self-assigned this Jul 3, 2023
@ChrisJStone ChrisJStone merged commit 5185400 into CJ-Systems:develop Jul 3, 2023
@ChrisJStone ChrisJStone mentioned this pull request Jul 6, 2023
ChrisJStone added a commit that referenced this pull request Jul 6, 2023
* feat(git-flow): add support for busybox(#12)

* feat(init): add support for environment credentials (#19)

Allows git flow to fall back to the same environment variables git uses
for setting the author and committer details if they are not present in
the users .gitconfig

* feat(init): add option to sign initial commit (#59)

When running git flow init the following option is now available when
creating a git repository using git flow..

1) -g, --[no]sign	Sign initial commit when creating a repository

When setting up git flow in a freshly created git repository with no
prior commits or when using git flow to create a git repository in an
existing folder the sign flag will create a signed empty commit with the
message initial commit.

* feat(feature): add feature release command (#64)

Added git flow feature release to provide a quick way to create a
release branch from a existing feature branch.

* fix(hotfix): git flow hotfix track fails due to branch name check (#68)
* feat(hotfix): add cherrypick option to hotfix finish (#73)
* feat(hotfix): add  backmerge option to release branch (#71)
* fix(hotfix): git flow hotfix finish -b back-merges to develop (#66)

When runing hotfix finish the following options have been the following
options have been added:

1) -r, --releaseBackmerge	Back-merge to release branch if exists
2) -c, --cherrypick		Cherry Pick to develop instead of merge
3) -b, --[no]nobackmerge	Don't merge master, or tag onto develop

NOTE: One one of the above three options can be used at any given time
since it doesn't make sence to combine them.

* fix(log): fix git flow log help message (#15)

git flow log help no longer implies it can only be used with feature
branches
ChrisJStone added a commit that referenced this pull request Jul 6, 2023
* feat(git-flow): add support for busybox(#12)

* feat(init): add support for environment credentials (#19)

Allows git flow to fall back to the same environment variables git uses
for setting the author and committer details if they are not present in
the users .gitconfig

* feat(init): add option to sign initial commit (#59)

When running git flow init the following option is now available when
creating a git repository using git flow..

1) -g, --[no]sign	Sign initial commit when creating a repository

When setting up git flow in a freshly created git repository with no
prior commits or when using git flow to create a git repository in an
existing folder the sign flag will create a signed empty commit with the
message initial commit.

* feat(feature): add feature release command (#64)

Added git flow feature release to provide a quick way to create a
release branch from a existing feature branch.

* fix(hotfix): git flow hotfix track fails due to branch name check (#68)
* feat(hotfix): add cherrypick option to hotfix finish (#73)
* feat(hotfix): add  backmerge option to release branch (#71)
* fix(hotfix): git flow hotfix finish -b back-merges to develop (#66)

When runing hotfix finish the following options have been the following
options have been added:

1) -r, --releaseBackmerge	Back-merge to release branch if exists
2) -c, --cherrypick		Cherry Pick to develop instead of merge
3) -b, --[no]nobackmerge	Don't merge master, or tag onto develop

NOTE: One one of the above three options can be used at any given time
since it doesn't make sence to combine them.

* fix(log): fix git flow log help message (#15)

git flow log help no longer implies it can only be used with feature
branches

* chore(release): release version 2.2.0

---------

Signed-off-by: Shea690901 <ginny690901@hotmail.de>
Co-authored-by: Filipe Kiss <hello@filipekiss.com.br>
Co-authored-by: Shea690901 <ginny690901@hotmail.de>
Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
Co-authored-by: ab <adamdd55@gmail.com>
Co-authored-by: Adam Rodger <adam.rodger@gmail.com>
Co-authored-by: Bankers, R.H.M. (Rob) <rob.bankers@sns.nl>
Co-authored-by: blooper05 <legend.of.blooper@gmail.com>
Co-authored-by: simonweil  <swdevelop1981@gmail.com>
ChrisJStone added a commit that referenced this pull request Jul 6, 2023
* docs(changelog): add release notes

* feat(git-flow): add support for busybox(#12)

* feat(init): add support for environment credentials (#19)

Allows git flow to fall back to the same environment variables git uses
for setting the author and committer details if they are not present in
the users .gitconfig

* feat(init): add option to sign initial commit (#59)

When running git flow init the following option is now available when
creating a git repository using git flow..

1) -g, --[no]sign	Sign initial commit when creating a repository

When setting up git flow in a freshly created git repository with no
prior commits or when using git flow to create a git repository in an
existing folder the sign flag will create a signed empty commit with the
message initial commit.

* feat(feature): add feature release command (#64)

Added git flow feature release to provide a quick way to create a
release branch from a existing feature branch.

* fix(hotfix): git flow hotfix track fails due to branch name check (#68)
* feat(hotfix): add cherrypick option to hotfix finish (#73)
* feat(hotfix): add  backmerge option to release branch (#71)
* fix(hotfix): git flow hotfix finish -b back-merges to develop (#66)

When runing hotfix finish the following options have been the following
options have been added:

1) -r, --releaseBackmerge	Back-merge to release branch if exists
2) -c, --cherrypick		Cherry Pick to develop instead of merge
3) -b, --[no]nobackmerge	Don't merge master, or tag onto develop

NOTE: One one of the above three options can be used at any given time
since it doesn't make sence to combine them.

* fix(log): fix git flow log help message (#15)

git flow log help no longer implies it can only be used with feature
branches

* chore(release): release version 2.2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant