mirror of
https://github.com/git/git
synced 2024-10-31 01:43:41 +00:00
18a8269242
Format the subshells introduced by the previous patch (Several tests: cd inside subshell instead of around, 2010-09-06) like so: ( cd subdir && ... ) && This is generally easier to read and has the nice side-effect that this patch will show what commands are used in the subshell, making it easier to check for lost environment variables and similar behavior changes. Cc: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
44 lines
1.2 KiB
Bash
Executable file
44 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"
|
|
) &&
|
|
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
|