Skip to content

TopGit-0.19.6
Compare
Choose a tag to compare
@mackyle mackyle released this 06 Mar 12:27
· 647 commits to master since this release
topgit-0.19.6
This tag was signed with the committer’s verified signature.
mackyle
GPG key ID: 587948425ADAEBD3
Learn about vigilant mode.
b93612b

Small bug fix release

  • When an octopus merge fails suppress simple merges for all of
    the affected heads not just the failing ones because if one of them
    needs to use a recursive merge to be successful then the rest need
    to also use that logic to avoid unexpected merge results.

  • The pre-loaded commit message when using tg create with multiple
    dependencies now survives the base merge again (regression fix)
    and the pre-loaded message is now suppressed for all but '[PATCH]'
    TopGit branches.

  • The tg update process can now return to any non-unborn HEAD.

  • The tg patch output will now survive passing through diff-highlight
    without being corrupted (workaround for diff-highlight bug).

  • If tg create would fail when it goes to checkout the first dependency
    then it will now fail right away before prompting for any messages.

  • Special characters (including spaces) in the repository's path no longer
    cause problems with the TopGit cache (mostly a regression fix).

  • Some more tests have been added as well as minor testing framework
    improvements.

  • The TopGit-specific index-only merge strategies are now described in
    full in the README file (accessible via tg help tg or tg help -w tg).

Kyle J. McKay (19):
      tg.sh: next version is 0.19.6
      tg-create.sh: preserve pre-loaded message during update
      t: remove "tg-" from test file names
      README: add merge strategy information
      tg-update.sh: suppress "automatic" merges on failed octopus
      tg-update.sh: allow detached return
      tg-create.sh: only preload "[PATCH]" commit msgs
      tg-patch.sh: add blank line before footer
      tg-create.sh: abort early if initial checkout would fail
      rename: t1001 -> t1000
      tg.sh: avoid problems with special chars in repo path
      tg.sh: refactor switch_to_base into checkout_symref_full
      tg.sh: allow checkout_symref_full to accept a hash
      tg-update.sh: allow returning to arbitrary HEADs
      t1100: test tg migrate-bases command
      test-lib.sh: make sure exported variables get cached
      test-lib*.sh: set GIT_CEILING_DIRECTORIES
      t0000: verify that git rev-parse --git-dir fails
      t*.sh: remove GIT_CEILING_DIRECTORIES settings
Assets 3
Loading