diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 17:52:34 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 17:52:34 (GMT) |
| commit | 5a139ba483efea47e103fef47afe87157e3bba77 (patch) | |
| tree | 9b387acffb4bd7b886d2a1b05e18832ad079bff9 /t/t9113-git-svn-dcommit-new-file.sh | |
| parent | fdac6692a0b0eda293f9f1bf4bc49b05b29f3c45 (diff) | |
| parent | edb7e82f72106add9f2fbaf9d99d9532a72e3f91 (diff) | |
| download | git-5a139ba483efea47e103fef47afe87157e3bba77.zip git-5a139ba483efea47e103fef47afe87157e3bba77.tar.gz git-5a139ba483efea47e103fef47afe87157e3bba77.tar.bz2 | |
Merge branch 'maint' into bc/master-diff-hunk-header-fix
* maint: (41 commits)
Clarify commit error message for unmerged files
Use strchrnul() instead of strchr() plus manual workaround
Use remove_path from dir.c instead of own implementation
Add remove_path: a function to remove as much as possible of a path
git-submodule: Fix "Unable to checkout" for the initial 'update'
Clarify how the user can satisfy stash's 'dirty state' check.
Remove empty directories in recursive merge
Documentation: clarify the details of overriding LESS via core.pager
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
builtin-prune.c: prune temporary packs in <object_dir>/pack directory
Do not perform cross-directory renames when creating packs
Use dashless git commands in setgitperms.perl
git-remote: do not use user input in a printf format string
make "git remote" report multiple URLs
Start draft release notes for 1.6.0.3
git-repack uses --no-repack-object, not --no-repack-delta.
...
Conflicts:
RelNotes
Diffstat (limited to 't/t9113-git-svn-dcommit-new-file.sh')
| -rwxr-xr-x | t/t9113-git-svn-dcommit-new-file.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh index ae78e33..c2b24a4 100755 --- a/t/t9113-git-svn-dcommit-new-file.sh +++ b/t/t9113-git-svn-dcommit-new-file.sh @@ -12,19 +12,7 @@ test_description='git-svn dcommit new files over svn:// test' . ./lib-git-svn.sh -if test -z "$SVNSERVE_PORT" -then - say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)' - test_done - exit -fi - -start_svnserve () { - svnserve --listen-port $SVNSERVE_PORT \ - --root "$rawsvnrepo" \ - --listen-once \ - --listen-host 127.0.0.1 & -} +require_svnserve test_expect_success 'start tracking an empty repo' ' svn mkdir -m "empty dir" "$svnrepo"/empty-dir && |