Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: charness/gitflow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: chassing/gitflow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 7, 2016

  1. Skip create tag during finish if it already exists

    The tagging during finish had a comment copied directly copied from the source
    of the bash implementation of git-flow:
    
    	In case a previous attempt to finish this release branch
       has failed, but the merge into develop was successful, we skip it
       now.
    
    But this had not been implemented. As long as tagging_info was set, the tag
    creation was unconditional. This change conditions it on the tag not yet
    existing.
    
    Without this change, the call to finish is not idempotent. Consider this
    sequence:
    * User calls finish
    * Finish tags the repo
    * Finish fails merging back to develop due to merge conflict
    * User resolves merge conflict
    * User calls finish again
    * Finish fails tagging the repo because the tag already exists
    
    By conditioning the tag, finish is idempotent. The second tag attempt is a
    NOP.
    
    Another commented acknowledged the non-implementation (via ":todo:") of a
    check that if the tag exists, it points to the commit. This change implements
    this check as well. Raise TagExistsError if the check fails.
    richfromm committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    60602ea View commit details
    Browse the repository at this point in the history
  2. Add test_finish_release_merge_conflict_tag

    Implement ":todo:" item of:
    * test-cases for finish + tag with merge-conflicts on develop
    
    Without the fix in the previous commit, this new test fails.
    
    With the fix in the previous commit, all tests pass.
    
    Modify helpers as needed to support this new test.
    
    Note that two related ":todo:" items are still *not* implemented:
    * test-cases for finish with merge-conflicts on master
    * test-cases for finish + tag with merge-conflicts on master
    richfromm committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    f0d2bc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. Merge pull request chassing#5 from locationlabs/feature/finish-tag-ex…

    …ists
    
    Feature/finish tag exists
    chassing authored Jun 15, 2016
    Configuration menu
    Copy the full SHA
    810c689 View commit details
    Browse the repository at this point in the history
  2. changes

    chassing committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    51db3c7 View commit details
    Browse the repository at this point in the history
  3. release 1.0.2

    chassing committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    7887759 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'release/v1.0.2'

    * release/v1.0.2:
      release 1.0.2
      changes
      Add test_finish_release_merge_conflict_tag
      Skip create tag during finish if it already exists
    chassing committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    62b2afa View commit details
    Browse the repository at this point in the history
  5. Merge tag 'v1.0.2' into develop

    v1.0.2
    
    * tag 'v1.0.2':
      release 1.0.2
    chassing committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    722ec6a View commit details
    Browse the repository at this point in the history
Loading