From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:17:38 +0000 (-0700)
Subject: Merge branch 'ld/p4-editor-multi-words'
X-Git-Tag: v2.5.0-rc0~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9fb0a798a74509ddc17f7ba7390abce5981c20de;p=git-core%2Fgit.git

Merge branch 'ld/p4-editor-multi-words'

Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the
command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'
did not let the shell interpolate the contents of the environment
variable that name the editor "$P4EDITOR" (and "$EDITOR", too).
Make it in line with the rest of Git, as well as with Perforce.

* ld/p4-editor-multi-words:
  git-p4: tests: use test-chmtime in place of touch
  git-p4: fix handling of multi-word P4EDITOR
  git-p4: add failing test for P4EDITOR handling
---

9fb0a798a74509ddc17f7ba7390abce5981c20de