mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
da083d688e
I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>
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_cmd 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_cmd co "$svnrepo" wc &&
|
|
cmp readme wc/readme
|
|
'
|
|
|
|
test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
|
|
svn_cmd 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_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
|
|
cmp readme readme.2
|
|
'
|
|
|
|
test_done
|