aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-04 15:02:28 -0800
committerJunio C Hamano <gitster@pobox.com>2011-03-04 15:02:28 -0800
commit6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b (patch)
tree38fec0463961cdf87bdd64510efee61f3dff9ebb /contrib
parent08fd8710e277eed73a21c6c5483c57bfeb14e8a7 (diff)
parentc9dbab045dea3dc44b81bfaca957fd8c3c7f079b (diff)
downloadgit-6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b.tar.gz
git-6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b.tar.xz
Merge branch 'mh/p4'
* mh/p4: git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index a4f440d11..2df3bb21c 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -570,7 +570,7 @@ class P4Submit(Command):
continue
if inDescriptionSection:
- if line.startswith("Files:"):
+ if line.startswith("Files:") or line.startswith("Jobs:"):
inDescriptionSection = False
else:
continue