mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
5a41c16a81
When editing the submit template, if no change was made to it, git p4 offers a prompt "Submit anyway?". Answering "no" cancels the submit. Previously, a "no" answer behaves like a "[s]kip" answer to the failed-patch prompt, in that it proceeded to try to apply the rest of the commits. Instead, put users back into the new "[s]kip / [c]ontinue" loop so that they can decide. This makes both cases of patch failure behave identically. The return code of git p4 after a "no" answer is now the same as that for a "skip" due to failed patch; update a test to understand this. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
103 lines
2.2 KiB
Bash
Executable file
103 lines
2.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 skipSubmitEdit config variables'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "change 1"
|
|
)
|
|
'
|
|
|
|
# this works because EDITOR is set to :
|
|
test_expect_success 'no config, unedited, say yes' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 2" &&
|
|
echo y | git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 2 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'no config, unedited, say no' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 3 (not really)" &&
|
|
printf "bad response\nn\n" | test_expect_code 1 git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 2 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'skipSubmitEdit' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
# will fail if editor is even invoked
|
|
git config core.editor /bin/false &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 3" &&
|
|
git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 3 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'skipSubmitEditCheck' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 4" &&
|
|
git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 4 wc
|
|
)
|
|
'
|
|
|
|
# check the normal case, where the template really is edited
|
|
test_expect_success 'no config, edited' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished "rm ed.sh" &&
|
|
cat >ed.sh <<-EOF &&
|
|
#!$SHELL_PATH
|
|
sleep 1
|
|
touch "\$1"
|
|
exit 0
|
|
EOF
|
|
chmod 755 ed.sh &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 5" &&
|
|
P4EDITOR="" EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 5 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|