Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 8, 2010
  1. Manually select the last argument.

    This implementation does not rely on Bash-specific functionality.
Commits on Aug 22, 2010
  1. @adamgibbins

    Fixed incorrect color flag

    adamgibbins authored
Commits on Aug 21, 2010
Commits on Jul 9, 2010
Commits on May 27, 2010
Commits on Apr 4, 2010
Commits on Feb 22, 2010
  1. Fix: bug introduced in b25ab83

  2. Reorder functions: Super-common functions go first, then all git-spec…

    functions, then gitflow-specific functions and finally, assertions to use
    in gitflow subcommands.
  3. Better naming of common functions categorizing them into common,

    git specific and git-flow specific functions:
    gitflow_current_branch             -> git_current_branch
    gitflow_is_branch_merged_into      -> git_is_branch_merged_into
    gitflow_local_branch_exists        -> git_local_branch_exists
    gitflow_local_branches             -> git_local_branches
    gitflow_remote_branches            -> git_remote_branches
    gitflow_require_branch             -> require_branch
    gitflow_require_branch_absent      -> require_branch_absent
    gitflow_require_branches_equal     -> require_branches_equal
    gitflow_require_clean_working_tree -> require_clean_working_tree
    gitflow_require_git_repo           -> require_git_repo
    gitflow_require_git_repo           -> require_git_repo
    gitflow_require_initialized        -> require_gitflow_initialized
    gitflow_require_initialized        -> require_gitflow_initialized
    gitflow_require_local_branch       -> require_local_branch
    gitflow_require_remote_branch      -> require_remote_branch
    gitflow_require_tag_absent         -> require_tag_absent
    gitflow_tag_exists                 -> git_tag_exists
    gitflow_test_branches_equal        -> git_compare_branches
    gitflow_test_clean_working_tree    -> git_is_clean_working_tree
    resolve_nameprefix                 -> gitflow_resolve_nameprefix
Commits on Feb 21, 2010
  1. Check whether this is a freshly git init'ed repo that's still HEADles…

    …s. In
    that case, don't check if the working tree is clean (this yields errors in
    HEADless repos).
    This fix enabled users to use "git init && git flow init", too.
Commits on Feb 20, 2010
  1. Added function gitflow_require_initialized(), to assert that the gitflow

    variables are all set (they need to be set explicitly once).
  2. Add function gitflow_has_prefixes_configured(), to check whether a re…

    …po is
    fully initialized for use with gitflow.
    Add a means of only asking for the missing gitflow definitions, not all.
    (Of course, redefining all is always possible using the -f (--force) flag
    of init.)
  3. Added tests for asserting correctly configured git-flow

    Added test for existence of local branches.
  4. Changed implementation of gitflow_all_branches() subtly, since "git b…

    -a" returns remote branches with a "remotes/" prefix. "git branch -r"
    still returns branch names we are used to.
  5. Changed GIT_DIR variable into DOT_GIT_DIR, since Git uses it and chok…

    …es if
    the variable is set explicitly by gitflow.
  6. Added implementation of git-flow-init that asks the user interactivel…

    …y what
    branches should be used for master and develop and then initializes the Git
    repo itself and/or the git-flow branches for him or her.
  7. Change implementation of gitflow_all_branches() to get its result dir…

    …ectly from
    git branch.
    Added gitflow_branch_exists() function for testing existence.
    Let gitflow_test_branches_equal() return with exit code 4 in case of the two
    branches having no common ancestor.
  8. Rewrite the way git-flow initialized its variables in git-flow and as…

    existence of a valid git repo. Instead, functions gitflow_load_settings()
    and gitflow_require_git_repo() have been added that can be called in each
    submodule that requires such.
    Specifically, git-flow init does NOT use this.
  9. Don't store remote and local branch names in shell variables, but query

    them live using git commands instead. This avoids git commands being
    issued by subcommands that do not necessarily require an existing Git repo
    to be initialized (i.e. git-flow init).
Commits on Feb 15, 2010
  1. Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:

    Went back from making use of the specific Bourne shell construct 'typeset
    -i' for easy integer calculations (typeset -i foo=123; foo=foo+456;) to a
    more compatible way (local foo=123; foo=$((foo+456)); )
    The 'typeset -f' call has been replaced by a call to 'type', effectively
    not testing for existence of a declared *function*, but testing for
    existence of a declared *something*. You have to sacrifice sometimes in
    order to be more portable.
Commits on Feb 9, 2010
Commits on Feb 8, 2010
  1. Made the finishing of release/hotfix branches fail-safe. When a

    release/hotfix branch fails finishing, the user may just try so again.
  2. Add tag annotation and tag signing to both release and hotfix.

    Require branch and tag to be absent when start is run (for release/hotfix)
    Require branch to exist when trying to finish (for release/hotfix)
    Die the finish script when either the fetch, checkout or tagging fails.
Commits on Feb 6, 2010
  1. Tidying up:

    - Move resolve_name_by_prefix() from git-flow-feature to gitflow-common
    - Rename require_name() to require_name_arg()
    - Refactor expanding of nameprefixes
  2. Tidy up:

    - Lower-cased all local variable names
    - Explicitly typeset all local variable names, to prevent issues with
      setting/overriding variables in the global namespace.
    - Explicitly typed integer types as integer (typeset -i) to enable simpler
      arithmetic calculations on them.
Commits on Feb 5, 2010
  1. Put all common functions into separate file gitflow-common.

    Renamed -> gitflow-shFlags
Something went wrong with that request. Please try again.