summaryrefslogtreecommitdiff
path: root/t/t9800-git-p4-basic.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 21:22:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 21:22:12 -0700
commit7bdb74868cf51245bce6ab033a1588e312e87310 (patch)
treee4333aea5eae79bcf488916bd0a212e197f9a51b /t/t9800-git-p4-basic.sh
parentMerge branch 'jk/push-delete-ref-error-message' (diff)
parentgit p4: notice Jobs lines in git commit messages (diff)
downloadtgif-7bdb74868cf51245bce6ab033a1588e312e87310.tar.xz
Merge branch 'pw/git-p4-jobs'
Teach "git p4" to notice "Jobs:" in the log message and relay it to Perforce to trigger its "jobs" support. # By Pete Wyckoff * pw/git-p4-jobs: git p4: notice Jobs lines in git commit messages git p4 test: refactor marshal_dump git p4: remove unused P4Submit interactive setting
Diffstat (limited to 't/t9800-git-p4-basic.sh')
-rwxr-xr-xt/t9800-git-p4-basic.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 07c2e157cb..b7ad716b09 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -155,11 +155,6 @@ test_expect_success 'clone bare' '
)
'
-marshal_dump() {
- what=$1
- "$PYTHON_PATH" -c 'import marshal, sys; d = marshal.load(sys.stdin); print d["'$what'"]'
-}
-
# Sleep a bit so that the top-most p4 change did not happen "now". Then
# import the repo and make sure that the initial import has the same time
# as the top-most change.