diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
| commit | c9c6cc8d7db312b9e8502f8d55422b8309cde2f3 (patch) | |
| tree | f13048eaaa0dd450171d2bce68ebe17e7c3a1847 /t | |
| parent | baede9f803ff7becab815481b004bc983d0422c7 (diff) | |
| parent | 93feb4bb14dbd5c89701d6f2b0ab3d83dbc999c5 (diff) | |
| download | git-c9c6cc8d7db312b9e8502f8d55422b8309cde2f3.tar.gz git-c9c6cc8d7db312b9e8502f8d55422b8309cde2f3.tar.xz | |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
checkout: Do not show local changes when in quiet mode
for-each-ref: Fix --format=%(subject) for log message without newlines
git-stash.sh: don't default to refs/stash if invalid ref supplied
maint: check return of split_cmdline to avoid bad config strings
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-repo-config.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 64567fb94..11b82f43d 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -741,4 +741,14 @@ test_expect_success 'symlinked configuration' ' ' +test_expect_success 'check split_cmdline return' " + git config alias.split-cmdline-fix 'echo \"' && + test_must_fail git split-cmdline-fix && + echo foo > foo && + git add foo && + git commit -m 'initial commit' && + git config branch.master.mergeoptions 'echo \"' && + test_must_fail git merge master + " + test_done |