2006-06-28 04:39:12 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Eric Wong
|
2008-09-08 12:02:08 +02:00
|
|
|
test_description='git svn commit-diff'
|
2006-06-28 04:39:12 +02:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
2008-05-04 07:37:59 +02:00
|
|
|
test_expect_success 'initialize repo' '
|
2006-06-28 04:39:12 +02:00
|
|
|
mkdir import &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd import &&
|
|
|
|
echo hello >readme &&
|
|
|
|
svn_cmd import -m "initial" . "$svnrepo"
|
2010-09-06 20:39:54 +02:00
|
|
|
) &&
|
2006-06-28 04:39:12 +02:00
|
|
|
echo hello > readme &&
|
|
|
|
git update-index --add readme &&
|
2008-05-04 07:37:59 +02:00
|
|
|
git commit -a -m "initial" &&
|
2006-06-28 04:39:12 +02:00
|
|
|
echo world >> readme &&
|
2008-05-04 07:37:59 +02:00
|
|
|
git commit -a -m "another"
|
|
|
|
'
|
2006-06-28 04:39:12 +02:00
|
|
|
|
2016-01-12 11:45:12 +01:00
|
|
|
head=$(git rev-parse --verify HEAD^0)
|
|
|
|
prev=$(git rev-parse --verify HEAD^1)
|
2006-06-28 04:39:12 +02:00
|
|
|
|
|
|
|
# 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
|
|
|
|
|
2008-05-04 07:37:59 +02:00
|
|
|
test_expect_success 'test the commit-diff command' '
|
|
|
|
test -n "$prev" && test -n "$head" &&
|
2008-09-08 12:02:08 +02:00
|
|
|
git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
|
2009-05-08 10:06:16 +02:00
|
|
|
svn_cmd co "$svnrepo" wc &&
|
2006-06-28 04:39:12 +02:00
|
|
|
cmp readme wc/readme
|
2008-05-04 07:37:59 +02:00
|
|
|
'
|
2006-06-28 04:39:12 +02:00
|
|
|
|
2008-09-08 12:02:08 +02:00
|
|
|
test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
|
2009-05-08 10:06:16 +02:00
|
|
|
svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
|
2008-09-08 12:02:08 +02:00
|
|
|
git svn init --minimize-url "$svnrepo"/subdir &&
|
|
|
|
git svn fetch &&
|
|
|
|
git svn commit-diff -r3 "$prev" "$head" &&
|
2009-05-08 10:06:16 +02:00
|
|
|
svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
|
2007-01-26 10:32:45 +01:00
|
|
|
cmp readme readme.2
|
2008-05-04 07:37:59 +02:00
|
|
|
'
|
2007-01-26 10:32:45 +01:00
|
|
|
|
2006-06-28 04:39:12 +02:00
|
|
|
test_done
|