Permalink
Commits on Mar 19, 2010
  1. Merge branch 'hotfix/0.2.1'

    committed Mar 19, 2010
  2. Strip the GIT_EXEC_PATH Makefile parameter. Replaced it by the more U…

    …nixy
    
    ``prefix''. There is no need to install git-flow inside git's libexec dir by
    default. It just needs to be *somewhere* on the PATH.
    committed Mar 19, 2010
  3. Bump the version number to 0.2.1

    committed Mar 19, 2010
Commits on Feb 24, 2010
  1. Merge branch 'release/0.2'

    committed Feb 24, 2010
  2. Bumped version number to 0.2

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

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

    …ific
    
    functions, then gitflow-specific functions and finally, assertions to use
    in gitflow subcommands.
    committed Feb 22, 2010
  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
    committed Feb 21, 2010
Commits on Feb 21, 2010
  1. Fix: put auto-detected Makefile path into a variable, but keep

    GIT_EXEC_PATH overrideable via Makefile command arguments.
    committed Feb 21, 2010
  2. 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.
    committed Feb 21, 2010
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).
    committed Feb 20, 2010
  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.)
    committed Feb 20, 2010
  3. Allow for setting back a prefix to '' (empty string) by entering '-'

    (dash), since the empty string '' means "take the default suggestion"
    already. Only needed in rare cases.
    committed Feb 20, 2010
  4. While we're user input in git flow init, ask the user for all prefix

    conventions, too.
    committed Feb 20, 2010
  5. Provided a better way of checking whether master/develop branches need

    initialization and a more user-friendly (and more comprehensable) way of
    asking the user which branches are the master/develop branch.
    committed Feb 20, 2010
  6. Added tests for asserting correctly configured git-flow

    environment/branches.
    
    Added test for existence of local branches.
    committed Feb 20, 2010
  7. Changed implementation of gitflow_all_branches() subtly, since "git b…

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

    …es if
    
    the variable is set explicitly by gitflow.
    committed Feb 19, 2010
  9. Always set the gitflow.branch.master and gitflow.branch.develop prope…

    …rties.
    
    They are required. Their existence tells us that this repository is
    gitflow-enabled.
    
    Added some TODO notes to implement.
    committed Feb 18, 2010
  10. 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.
    committed Feb 18, 2010
  11. 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.
    committed Feb 18, 2010
  12. Rewrite the way git-flow initialized its variables in git-flow and as…

    …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.
    committed Feb 16, 2010
  13. 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).
    committed Feb 16, 2010
Commits on Feb 19, 2010
  1. Fix spacing issues.

    committed Feb 19, 2010