maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(third_party/git): Merge squashed git subtree at v2.23.0

Browse source 
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

64
third_party/git/t/t9162-git-svn-dcommit-interactive.sh vendored Executable file
View file

@ -0,0 +1,64 @@
#!/bin/sh
#
# Copyright (c) 2011 Frédéric Heitzmann
test_description='git svn dcommit --interactive series'
. ./lib-git-svn.sh
test_expect_success 'initialize repo' '
svn_cmd mkdir -m"mkdir test-interactive" "$svnrepo/test-interactive" &&
git svn clone "$svnrepo/test-interactive" test-interactive &&
cd test-interactive &&
touch foo && git add foo && git commit -m"foo: first commit" &&
git svn dcommit
'
test_expect_success 'answers: y [\n] yes' '
(
echo "change #1" >> foo && git commit -a -m"change #1" &&
echo "change #2" >> foo && git commit -a -m"change #2" &&
echo "change #3" >> foo && git commit -a -m"change #3" &&
( echo "y
y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
)
'
test_expect_success 'answers: yes yes no' '
(
echo "change #1" >> foo && git commit -a -m"change #1" &&
echo "change #2" >> foo && git commit -a -m"change #2" &&
echo "change #3" >> foo && git commit -a -m"change #3" &&
( echo "yes
yes
no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
git reset --hard remotes/git-svn
)
'
test_expect_success 'answers: yes quit' '
(
echo "change #1" >> foo && git commit -a -m"change #1" &&
echo "change #2" >> foo && git commit -a -m"change #2" &&
echo "change #3" >> foo && git commit -a -m"change #3" &&
( echo "yes
quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
git reset --hard remotes/git-svn
)
'
test_expect_success 'answers: all' '
(
echo "change #1" >> foo && git commit -a -m"change #1" &&
echo "change #2" >> foo && git commit -a -m"change #2" &&
echo "change #3" >> foo && git commit -a -m"change #3" &&
( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
git reset --hard remotes/git-svn
)
'
test_done