diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
| commit | d3e977b943b3562021b892f1c8f966655785708a (patch) | |
| tree | 13175e8b425489c2f4bbf7196e5475fe16fd7ab3 /t | |
| parent | 5e2c08c6f0209e94b36d0770abae1a2b571cb0f1 (diff) | |
| parent | 3b2bbe9b8584947e33e9149f605149530faa7361 (diff) | |
| download | git-d3e977b943b3562021b892f1c8f966655785708a.tar.gz git-d3e977b943b3562021b892f1c8f966655785708a.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: fix formatting in git-svn
t7502-commit.sh: test_must_fail doesn't work with inline environment variables
completion: add --graph to log command completion
git-merge.sh: fix typo in usage message: sucesses --> succeeds
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7502-commit.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index ed871a6b4..c25eff9e4 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -212,7 +212,11 @@ test_expect_success 'do not fire editor in the presence of conflicts' ' # Must fail due to conflict test_must_fail git cherry-pick -n master && echo "editor not started" >.git/result && - test_must_fail GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" git commit && + ( + GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" && + export GIT_EDITOR && + test_must_fail git commit + ) && test "$(cat .git/result)" = "editor not started" ' |