mirror of
https://github.com/git/git
synced 2024-10-31 08:22:52 +00:00
f69e836fab
This fixes the remainder of the issues where the test script itself is at fault for failing when the git checkout path contains whitespace or other shell metacharacters. The majority of git svn tests used the idiom test_expect_success "title" "test script using $svnrepo" These were changed to have the test script in single-quotes: test_expect_success "title" 'test script using "$svnrepo"' which unfortunately makes the patch appear larger than it really is. One consequence of this change is that in the verbose test output the value of $svnrepo (and in some cases other variables, too) is no longer expanded, i.e. previously we saw * expecting success: test script using /path/to/git/t/trash/svnrepo but now it is: * expecting success: test script using "$svnrepo" Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
43 lines
1.2 KiB
Bash
Executable file
43 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
test_description='git-svn commit-diff'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'initialize repo' '
|
|
mkdir import &&
|
|
cd import &&
|
|
echo hello > readme &&
|
|
svn import -m "initial" . "$svnrepo" &&
|
|
cd .. &&
|
|
echo hello > readme &&
|
|
git update-index --add readme &&
|
|
git commit -a -m "initial" &&
|
|
echo world >> readme &&
|
|
git commit -a -m "another"
|
|
'
|
|
|
|
head=`git rev-parse --verify HEAD^0`
|
|
prev=`git rev-parse --verify HEAD^1`
|
|
|
|
# the internals of the commit-diff command are the same as the regular
|
|
# commit, so only a basic test of functionality is needed since we've
|
|
# already tested commit extensively elsewhere
|
|
|
|
test_expect_success 'test the commit-diff command' '
|
|
test -n "$prev" && test -n "$head" &&
|
|
git-svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
|
|
svn co "$svnrepo" wc &&
|
|
cmp readme wc/readme
|
|
'
|
|
|
|
test_expect_success 'commit-diff to a sub-directory (with git-svn config)' '
|
|
svn import -m "sub-directory" import "$svnrepo"/subdir &&
|
|
git-svn init --minimize-url "$svnrepo"/subdir &&
|
|
git-svn fetch &&
|
|
git-svn commit-diff -r3 "$prev" "$head" &&
|
|
svn cat "$svnrepo"/subdir/readme > readme.2 &&
|
|
cmp readme readme.2
|
|
'
|
|
|
|
test_done
|