git-flow AVH Edition 1.1.0 Released

[Peter van der Does]

Today we released a new version of git-flow AVH Edition. You can download the version or check the full code on the github page

Some release notes:

• Add the ability to keep/delete local/remote branches on finish.
  When finishing a release/hotfix/feature you now can keep/delete the local/remote release/hotfix/feature branch.

• New command: git flow release branch
  With this command you can directly release a given branch. There is no need to start a new release and finish it. You can not use this command on the git-flow branches feature/hotfix/release/support.

• Support reading the tag message from a file in release/hotfix finish.
  Add the option -f,--messagefile to release and hotfix finish.

• The sub-commands feature, release and hotfix now have a new sub-action, delete.
  With that action you can delete the branches, locally and remote. The action has two options, -f and -r. With -f you can force the deletion, even when the to be deleted branch was not merged yet. With -r the remote branch will also be deleted.

• Feature and Release squashing options.
  This allows a -S option to both feature and releasing finishing actions so that developers can squash commits into one large one.

For a complete look on the changes check out the Changelog on github.

[Markus Gattol]

great news, thanks!

[Mark Derricutt]

Awesome, will have to check this out - hadn't actually seen your forked branch before.

Is the AVH edition a total fork of nvies' never to merge? I see a few commits on nvie's repository that don't merge into AVH ( altho I suspect some of them have already been superseeded with changes on the AVH release )?

Do you have a list of all changes/differences?

[Peter van der Does]

By this time, with the amount of changes I did, it's very unlikely this fork will have merge back to the nvie branch. That's why I decided to call it the AVH Edition.

I have been keeping an eye, and I still am, on the issues at nvie's branch and some of them I manually incorporated into the AVH Edition. So indeed a couple of  issues on nvie's branch are superseded by the AVH edition.

I don't have a complete list of changes and differences, it's some of the inner working of git-flow that I changed, replacing porcelain commands with plumbing commands, for the users I guess it's mostly what I stated in the 1st email. All the changes are in Changelog and I started changing from version 0.4.2-avh1 although some of the changes I made since then have been merged into nvie's repo as well. So long story short, I can't give an overview of changes/differences compared to nvie's current develop branch.

[Markus Gattol]

would be nice if the debian package would get your branch then, maybe you'll want to tell the maintainer about this; here's the info right from the package on Debian:

(master u=) sa@sub:~/0/2/meteor$ apt-cache show git-flow

Package: git-flow

Version: 0.4.1-2

Installed-Size: 110

Maintainer: Gergely Nagy <alge...@madhouse-project.org>

Architecture: all

Depends: git | git-core

Description-en: Git extension to provide a high-level branching model

 A set of scripts that provide high-level repository operations for

 managing feature/release/hotfix branches in a Git repository,

 particularly suited to be utilised to follow Vincent Driessen's

 branching model, described at

 <http://nvie.com/posts/a-successful-git-branching-model/>.

Homepage: https://github.com/nvie/gitflow/wiki

Description-md5: 67abe51a90fde2614c903ffb227e0dc3

Section: vcs

Priority: extra

Filename: pool/main/g/git-flow/git-flow_0.4.1-2_all.deb

Size: 27458

MD5sum: c86dd0d6958e16e420ab2d4a75eccb03

SHA1: 493b58f81b159af46ffd51c1671d4c47106ef705

SHA256: ba0f425e9b4acdeef6dae004c39b3032df5cacdfdfb6619273baba759366257b

(master u=) sa@sub:~/0/2/meteor$ 

[Mark Derricutt]

Strange, when I release my branch now using this AVH branch I see:

Summary of actions:
- Release branch 'release/6.0.20' has been merged into 'master'
- The release was tagged '6.0.20'
/Users/amrk/Dropbox/gitflow-avh/gitflow-common: line 65: [: -eq: unary operator expected
/Users/amrk/Dropbox/gitflow-avh/gitflow-common: line 65: [: -eq: unary operator expected
- Release branch 'release/6.0.20' 'has been deleted
- You are now on branch 'master'


This is on OSX.  Also, the commit I see back into develop now reads:

    Merge tag '6.0.20' into develop

normally its merge branch release/xxx into develop - and I just had what looked like a REALLLLY old branch get merged into my development branch for one project - corresponding to this tag merge, which is odd....


--
"Great artists are extremely selfish and arrogant things" — Steven Wilson, Porcupine Tree

[Peter van der Does]

What was the full command you used for the git flow release finish? It seems something went wrong with a flag you gave to the command.

On the merge tag:

It has been changed to merge the tag instead of the branch to be git describe friendly and the develop branch now is an exact copy of the master branch. Why it seems like a really old branch is merged I can't really explain except that maybe the merge base between master and develop is different when merging a tag for the first time.

[Mark Derricutt]

On 7/08/2012, at 1:27 AM, Peter van der Does <pvand...@gmail.com> wrote:

> What was the full command you used for the git flow release finish? It seems something went wrong with a flag you gave to the command.
>

Just what I always do:

git flow release finish 3.1.2

replacing the version arg with the particular version.

This is under OSX and zsh as my shell.

> On the merge tag:
> It has been changed to merge the tag instead of the branch to be git describe friendly and the develop branch now is an exact copy of the master branch. Why it seems like a really old branch is merged I can't really explain

Ah that explains things - still not sure what happened with the merge as it didn't seem to do it on other repositories... strange.

[Peter van der Does]

Did you ran git flow release finish twice?
Or is there a chance the master branch was manually merged in the
develop branch before you ran the finish?

The reason I asked, in your pasted output:

- The release was tagged '6.0.20'
/Users/amrk/Dropbox/gitflow-avh/gitflow-common: line 65: [: -eq: unary
operator expected
/Users/amrk/Dropbox/gitflow-avh/gitflow-common: line 65: [: -eq: unary
operator expected
- Release branch 'release/6.0.20' 'has been deleted

I'm missing the notification for what has been merged into develop.
That would only happen if the master branch had been merged in the
develop branch already.

--
Peter van der Does

GPG key: CB317D6E

IRC: Ganseki on irc.freenode.net
Twitter: @petervanderdoes

[Mark Derricutt]

It's possible I ran the release twice as on occasion my master's not been fully up to date and the merge would fail, which under nvie's branch would just crash out gitflow, after doing a git pull on master to bring it up to date I could then rerun git flow and have it merge and delete the branch properly.

( this usually happens when another member of the team has done a release and my master branch hasn't been pulled ).

[james....@gmail.com]

hey -

  i'd like to modify/commit a project file (eg mvn pom.xml) during a 'git flow release branch ...' invocation yet i am unable to exec a hook to make this happen.

  q: what is the best way to revision files when merging from develop-to-master? eg develop mvn pom.xml *-SNAPSHOT to master mvn pom.xml [milestone] version

  thx,

- james

[Luke Farrar]

Hi James,

I hit the same snag and wrote a maven plugin to do this for me - https://github.com/lukepfarrar/gitflow-maven-plugin
However Atlassian maintain a much more substantial plugin which is probably the thing to use; I haven't tried it yet as my itch had been scratched - https://bitbucket.org/atlassian/maven-jgitflow-plugin

Hope that helps,

Luke

--
You received this message because you are subscribed to the Google Groups "gitflow-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to gitflow-user...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

-- 
Luke Farrar
Java Developer
The Book People Ltd.