topgit-0.19.6

TopGit-0.19.6

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
-----BEGIN PGP SIGNATURE-----

iQPcBAABAgAGBQJYu8sVAAoJEFh5SEJa2uvTREkd/1CzHiyckdq4vItt4+UxjydH
uT5jh/DkInTifVzp2cW7B15qZ7v1aOd5WrxK3lB5GRJMWSTSoYD2KzcbBJky1yl9
ByyX1qxXs/0BG0X6KmGZ/anaFm5ON26dHtNkjaxpIfhEaKMro3GrFJ4UEN/KYVx6
sAFpYqUC1J4dG9kH1skHGnDTc5nBjMhnhLXGIQd8ARfj7eQx00gG7Q2OKfvANrar
jAkL9CxTmS9v9wKWzzNkbhLF7wycWirUW7/VnC+IzUogtMDACaOmJ3bbf1iV+1eP
Zt80TXlceIOeqni/zBrjkJWgGvEL48hcd66AubR+N+A68KGUXlkn48n1C/v2uTJx
Ff6AxEFYnTJubnbGFOKRdzFgmvuhLfWyn3Cl4pqw37cPpwRBHorhB+z2TtozY+eU
hjT2SnYR6y0OZQVdZNcIUpRYOhy6KkMRunkp7ZWwI3WaiganrC5tpz6iE+2CO6N8
WpaOaDRg5VCS0+rQdlXHQXjcweNyXOrqgoItTfCOtQ2XpWUqmK94BoqLRq2eQLsH
uP/ReQ0t3+hSabYJmKWD66NPi76DDCRCCef0SwbgiUXUv8RSkeS+jFh3t/pdctBz
fZIDZ98AJ7wrLWzUTqoZBezvNcFIpc1FqdzpMPjfnMKnDVopZbe+AtN5cFDcDuaE
DMMChpal+D7zKSxt7dPnma+pbhaeImZ+8BPJOHW92tjTygiXgBYngfabAvb8rcRe
x89xdJ23OJYgiiG2KMB1ncMqztyaFnR42QIdy22sKGXvcpPcEmkEbRK5lXYW9wVs
pQbznKx5cZNeAIVgsCGe1h3a2mmkp+3NgOqQByv6DuBLIGO3SjUpusFtkzPnuNR5
ISnu5ZkE2kqjAoEfIeXctalboJTk2VaW5pIgLzOp60ZmeDMV+M0l+qt4zAlhUySW
0T7Ou8ot6uxLcnVRMhRs54iGwdYL58+Otnpd2LXSrJ9WAX57bD6+V7S26mQh3yFo
laWOrz2emYt+wA58wC2vrRlyEuQn2dmJ8pK2km+biXQ+6qli3QbVoJ/J/BWJtcqf
muoYrZ4ZTgeart4I/fGr4/tJdUO5XVnbWEyWclB8TswFWT35h2VbfZe5hPb6ss0Q
2mmSZ15KjHJtUC7mxSyTiTQhttLZc1Z9QWVy/c9dYTZG2x5ADXyt/iMeXr6DFanD
mKgPRRw4uFUdZ5FjOcYHC7OKxhK5nvaKZJzIGNkR+a3udMYz8QKD3fvpnKU8FPIp
QXE19kys9k/MgqaAvBOHQy+fUXkW56ylrM07+gI+bg==
=mF4F
-----END PGP SIGNATURE-----