From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Feb 2016 18:13:31 +0000 (-0800)
Subject: Merge branch 'nd/clear-gitenv-upon-use-of-alias'
X-Git-Tag: v2.8.0-rc0~52
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=dbda66b0e283494c35958316c9b1c47b6e6c9f59;p=git.git

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()
---

dbda66b0e283494c35958316c9b1c47b6e6c9f59