diff options
| author | Michael Horowitz <michael.horowitz@ieee.org> | 2011-02-25 21:31:13 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-25 23:39:41 -0800 |
| commit | c9dbab045dea3dc44b81bfaca957fd8c3c7f079b (patch) | |
| tree | f7c796102f02bbc81d38b39f1022692a9be54342 /contrib | |
| parent | 046613c5465e4fc0611f93a5ef31d3815fb50c22 (diff) | |
| download | git-c9dbab045dea3dc44b81bfaca957fd8c3c7f079b.tar.gz git-c9dbab045dea3dc44b81bfaca957fd8c3c7f079b.tar.xz | |
git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
In an attempt to overwrite the 'Description:' section of the p4 change
log to include the git commit messages, it also overwrote the 'Jobs:'
section. Â This fix restores the 'Job:' section.
Signed-off-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index a92beb629..8b00fd879 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 |