Merge branch 'nd/clear-gitenv-upon-use-of-alias'
commitdbda66b0e283494c35958316c9b1c47b6e6c9f59
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:31 +0000 (17 10:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:31 +0000 (17 10:13 -0800)
treecfbee1f5d4982aa377386aafc2661568dbc2e70a
parentf60ccdd98c3f1183922b43478b629049408849ff
parent8384c139cb9409fb3cf5ef70afff263917581258
Merge branch 'nd/clear-gitenv-upon-use-of-alias'

The automatic typo correction applied to an alias was broken
with a recent change already in 'master'.

* nd/clear-gitenv-upon-use-of-alias:
  restore_env(): free the saved environment variable once we are done
  git: simplify environment save/restore logic
  git: protect against unbalanced calls to {save,restore}_env()
  git: remove an early return from save_env_before_alias()
git.c