[PATCH] Fix git-p4 submit in non --prepare-p4-only mode

b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here is a proper fix, including proper handling for windows end of lines. Signed-off-by: Maxime Coste Acked-by: Pete Wyckoff --- git-p4.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/git-p4.py b

Re: [PATCH] Fix git-p4 submit in non --prepare-p4-only mode

hine. It works, only one test fail (detect copy), but this test already fails with my two patches reverted. This should be applied soon (or alternatively b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 should be reverted) in master, as in the current state git p4 submit will fail most of the time. I'

[PATCH] Fix git-p4 submit in non --prepare-p4-only mode

b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here is a proper fix, including proper handling for windows end of lines. Signed-off-by: Maxime Coste --- git-p4.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/git-p4.py b/git-p4.py index 7bb0f73

[PATCH] git-p4: Do not include diff in spec file when just preparing p4

diff being present in the file. Not including the diff fixes that. Without --prepare-p4-only, keeping the diff makes sense for a quick review of the patch before submitting it. And does not cause problems with p4 as we remove it programmatically. Signed-off-by: Maxime Coste Acked-by: Pete

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

Hello Sorry for the delay, I hope that version is more acceptable. I updated the test case as well, but did not manage to get the actual p4 tests to work here (I have p4 and p4d installed, they start but all the other tests seems to fail). Still the change is straightforward. Cheers, Maxime

[PATCH] git-p4: Do not include diff in spec file when just preparing p4

diff being present in the file. Not including the diff fixes that. Without --prepare-p4-only, keeping the diff makes sense for a quick review of the patch before submitting it. And does not cause problems with p4 as we remove it programmatically. Signed-off-by: Maxime Coste --- git-p4.py

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

change. Removing the diff could be done externally, however git-p4 itself tells the user it can submit using the generated file, which is not the case if we keep the diff in it. Cheers, Maxime Coste. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mes

[PATCH] git-p4: Do not include diff in spec file when just preparing p4

The diff information render the spec file unusable as is by p4, do not include it when run with --prepare-p4-only so that the given file can be directly passed to p4. --- git-p4.py | 70 +++ 1 file changed, 39 insertions(+), 31 deletions(

[no subject]

subscribe git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html