Skip to content

Commit

Permalink
Merge branch 'jc/unexport-git-pager-in-use-in-pager'
Browse files Browse the repository at this point in the history
When you say "!<ENTER>" while running say "git log", you'd confuse
yourself in the resulting shell, that may look as if you took
control back to the original shell you spawned "git log" from but
that isn't what is happening.  To that new shell, we leaked
GIT_PAGER_IN_USE environment variable that was meant as a local
communication between the original "Git" and subprocesses that was
spawned by it after we launched the pager, which caused many
"interesting" things to happen, e.g. "git diff | cat" still paints
its output in color by default.

Stop leaking that environment variable to the pager's half of the
fork; we only need it on "Git" side when we spawn the pager.

* jc/unexport-git-pager-in-use-in-pager:
  pager: do not leak "GIT_PAGER_IN_USE" to the pager
  • Loading branch information
Junio C Hamano committed Jul 13, 2015
2 parents 43f23b0 + 124b519 commit 6cf7eef
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pager.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void setup_pager(void)
argv_array_push(&pager_process.env_array, "LESS=FRX");
if (!getenv("LV"))
argv_array_push(&pager_process.env_array, "LV=-c");
argv_array_push(&pager_process.env_array, "GIT_PAGER_IN_USE");
if (start_command(&pager_process))
return;

Expand Down

0 comments on commit 6cf7eef

Please sign in to comment.