Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: 0.2
Commits on Feb 24, 2010
  1. Bumped version number to 0.2

    authored
Commits on Feb 22, 2010
  1. Fix: bug introduced in b25ab83

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

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

    authored
    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. Fix: put auto-detected Makefile path into a variable, but keep

    authored
    GIT_EXEC_PATH overrideable via Makefile command arguments.
  2. Check whether this is a freshly git init'ed repo that's still HEADles…

    authored
    …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

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

    authored
    …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. Allow for setting back a prefix to '' (empty string) by entering '-'

    authored
    (dash), since the empty string '' means "take the default suggestion"
    already. Only needed in rare cases.
  4. Provided a better way of checking whether master/develop branches need

    authored
    initialization and a more user-friendly (and more comprehensable) way of
    asking the user which branches are the master/develop branch.
  5. Added tests for asserting correctly configured git-flow

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

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

    authored
    …es if
    
    the variable is set explicitly by gitflow.
  8. Always set the gitflow.branch.master and gitflow.branch.develop prope…

    authored
    …rties.
    
    They are required. Their existence tells us that this repository is
    gitflow-enabled.
    
    Added some TODO notes to implement.
  9. Added implementation of git-flow-init that asks the user interactivel…

    authored
    …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.
  10. Change implementation of gitflow_all_branches() to get its result dir…

    authored
    …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.
  11. Rewrite the way git-flow initialized its variables in git-flow and as…

    authored
    …sumed
    
    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.
  12. Don't store remote and local branch names in shell variables, but query

    authored
    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 19, 2010
  1. Fix spacing issues.

    authored
  2. Jason L. Shiffer
Commits on Feb 16, 2010
Commits on Feb 15, 2010
  1. Fixed a problem with redirection of stdout/stderr. The specifier '2>&1'

    authored
    should come *after* the redirection of stdout to /dev/null. For an
    explanation and a simple demonstration of the differences, see:
    
    	http://is.gd/8srJR
Something went wrong with that request. Please try again.