author | Junio C Hamano <gitster@pobox.com> | |
Wed, 14 May 2008 20:45:16 +0000 (13:45 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 14 May 2008 20:45:16 +0000 (13:45 -0700) |
* bd/tests:
Rename the test trash directory to contain spaces.
Fix tests breaking when checkout path contains shell metacharacters
Don't use the 'export NAME=value' in the test scripts.
lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
test-lib.sh: Fix some missing path quoting
Use test_set_editor in t9001-send-email.sh
test-lib.sh: Add a test_set_editor function to safely set $VISUAL
git-send-email.perl: Handle shell metacharacters in $EDITOR properly
config.c: Escape backslashes in section names properly
git-rebase.sh: Fix --merge --abort failures when path contains whitespace
Conflicts:
t/t9115-git-svn-dcommit-funky-renames.sh
Rename the test trash directory to contain spaces.
Fix tests breaking when checkout path contains shell metacharacters
Don't use the 'export NAME=value' in the test scripts.
lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters
test-lib.sh: Fix some missing path quoting
Use test_set_editor in t9001-send-email.sh
test-lib.sh: Add a test_set_editor function to safely set $VISUAL
git-send-email.perl: Handle shell metacharacters in $EDITOR properly
config.c: Escape backslashes in section names properly
git-rebase.sh: Fix --merge --abort failures when path contains whitespace
Conflicts:
t/t9115-git-svn-dcommit-funky-renames.sh
1 | 2 | |||
---|---|---|---|---|
config.c | patch | | diff1 | | diff2 | | blob | history |
git-rebase.sh | patch | | diff1 | | diff2 | | blob | history |
git-send-email.perl | patch | | diff1 | | diff2 | | blob | history |
t/lib-git-svn.sh | patch | | diff1 | | diff2 | | blob | history |
t/t3400-rebase.sh | patch | | diff1 | | diff2 | | blob | history |
t/t6200-fmt-merge-msg.sh | patch | | diff1 | | diff2 | | blob | history |
t/t7003-filter-branch.sh | patch | | diff1 | | diff2 | | blob | history |
t/t7501-commit.sh | patch | | diff1 | | diff2 | | blob | history |
t/t9001-send-email.sh | patch | | diff1 | | diff2 | | blob | history |
t/t9115-git-svn-dcommit-funky-renames.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc config.c
Simple merge
diff --cc git-rebase.sh
Simple merge
diff --cc git-send-email.perl
Simple merge
diff --cc t/lib-git-svn.sh
Simple merge
diff --cc t/t3400-rebase.sh
Simple merge
diff --cc t/t6200-fmt-merge-msg.sh
Simple merge
diff --cc t/t7003-filter-branch.sh
Simple merge
diff --cc t/t7501-commit.sh
Simple merge
diff --cc t/t9001-send-email.sh
Simple merge
diff --cc t/t9115-git-svn-dcommit-funky-renames.sh
index 4acbcb0acdce7852ee1f416250b5939132a93ca1,298445f7d9f8d34ba14f11d7976feff5fb0cea42..f0fbd3aff7e63f64f8ba388db805013c43b4b22c
. ./lib-git-svn.sh
- test_expect_success 'load repository with strange names' "
- svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&
+ test_expect_success 'load repository with strange names' '
+ svnadmin load -q "$rawsvnrepo" < ../t9115/funky-names.dump &&
- start_httpd
+ start_httpd gtk+
- "
+ '
- test_expect_success 'init and fetch repository' "
- git svn init $svnrepo &&
+ test_expect_success 'init and fetch repository' '
+ git svn init "$svnrepo" &&
git svn fetch &&
git reset --hard git-svn
- "
+ '
test_expect_success 'create file in existing ugly and empty dir' '
mkdir "#{bad_directory_name}" &&
git svn dcommit
'
- test_expect_success 'clone the repository to test rebase' "
- git svn clone $svnrepo test-rebase &&
+test_expect_success 'add a file with plus signs' '
+ echo .. > +_+ &&
+ git update-index --add +_+ &&
+ git commit -m plus &&
+ mkdir gtk+ &&
+ git mv +_+ gtk+/_+_ &&
+ git commit -m plus_dir &&
+ git svn dcommit
+ '
+
- "
++test_expect_success 'clone the repository to test rebase' '
++ git svn clone "$svnrepo" test-rebase &&
+ cd test-rebase &&
+ echo test-rebase > test-rebase &&
+ git add test-rebase &&
+ git commit -m test-rebase &&
+ cd ..
- test_expect_success 'make a commit to test rebase' "
++ '
+
- "
++test_expect_success 'make a commit to test rebase' '
+ echo test-rebase-main > test-rebase-main &&
+ git add test-rebase-main &&
+ git commit -m test-rebase-main &&
+ git svn dcommit
- test_expect_success 'git-svn rebase works inside a fresh-cloned repository' "
++ '
+
- "
++test_expect_success 'git-svn rebase works inside a fresh-cloned repository' '
+ cd test-rebase &&
+ git svn rebase &&
+ test -e test-rebase-main &&
+ test -e test-rebase
++ '
+
stop_httpd
test_done