Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
format-patch: inform user that patch-id generation is unstable
[gitweb.git]
/
t
/
t9801-git-p4-branch.sh
diff --git
a/t/t9801-git-p4-branch.sh
b/t/t9801-git-p4-branch.sh
index 6a86d6996b97de0bed0503021b76b33db8441029..38d6b9043b2039d97cdb634ac86658c45ec36abd 100755
(executable)
--- a/
t/t9801-git-p4-branch.sh
+++ b/
t/t9801-git-p4-branch.sh
@@
-151,7
+151,7
@@
test_expect_success 'import depot, branch detection, branchList branch definitio
'
test_expect_success 'restart p4d' '
-
kill
_p4d &&
+
stop_and_cleanup
_p4d &&
start_p4d
'
@@
-505,7
+505,7
@@
test_expect_success 'use-client-spec detect-branches skips files in branches' '
'
test_expect_success 'restart p4d' '
-
kill
_p4d &&
+
stop_and_cleanup
_p4d &&
start_p4d
'
@@
-610,8
+610,4
@@
test_expect_success 'Update a file in git side and submit to P4 using client vie
)
'
-test_expect_success 'kill p4d' '
- kill_p4d
-'
-
test_done