git/git-p4.py, branch v2.4.2

Merge branch 'ld/p4-submit-hint'

2015-02-11T21:39:44Z

* ld/p4-submit-hint: git-p4: correct --prepare-p4-only instructions

git-p4: support excluding paths on sync

2015-02-11T21:38:29Z

The clone subcommand has long had support for excluding subdirectories, but sync has not. This is a nuisance, since as soon as you do a sync, any changed files that were initially excluded start showing up. Move the "exclude" command-line option into the parent class; the actual behavior was already present there so it simply had to be exposed. Signed-off-by: Luke Diamand Reviewed-by: Pete Wyckoff Signed-off-by: Junio C Hamano

git-p4: correct --prepare-p4-only instructions

2015-01-23T22:44:14Z

If you use git-p4 with the "--prepare-p4-only" option, then it prints the p4 command line to use. However, the command line was incorrect: the changelist specification must be supplied on standard input, not as an argument to p4. Signed-off-by: Luke Diamand Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano

git-p4: fix submit in non --prepare-p4-only mode

2014-06-13T18:04:04Z

b4073bb3 (git-p4: Do not include diff in spec file when just preparing p4, 2014-05-24) 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 Signed-off-by: Junio C Hamano

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

2014-05-27T19:35:15Z

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. With --prepare-p4-only, git-p4 already tells the user it can use p4 submit with the generated spec file. This fails because of the 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 Wyckoff Signed-off-by: Junio C Hamano

Merge branch 'cl/p4-use-diff-tree'

2014-05-07T21:39:29Z

Fixes a regression in 1.9.0 with an obviously correct single-liner. * cl/p4-use-diff-tree: git-p4: format-patch to diff-tree change breaks binary patches

git-p4: format-patch to diff-tree change breaks binary patches

2014-05-07T17:27:22Z

When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index. When git-p4 runs git-apply to test the patch, git-apply rejects the patch due to abbreviated blob object names. This is the error message git-apply emits in this case: error: cannot apply binary patch to '' without full index line error: : patch does not apply Signed-off-by: Tolga Ceylan Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano

git-p4: explicitly specify that HEAD is a revision

2014-04-07T22:37:12Z

'git p4 rebase' fails with the following message if there is a file named HEAD in the current directory: fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' Take the suggestion above and explicitly state that HEAD should be treated as a revision. Signed-off-by: Vlad Dogaru Acked-by: Pete Wyckoff Signed-off-by: Junio C Hamano

git p4: fix an error message when "p4 where" fails

2014-01-22T16:06:19Z

When "p4 where" fails, for whatever reason, the error message tries to show an undefined variable. This minor bug applies only when using a client spec, and was introduced recently in 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30). Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano

git p4: handle files with wildcards when doing RCS scrubbing

2014-01-22T16:06:19Z

Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29) fixed problems with handling files that had p4 wildcard characters, like "@" and "*". But it missed one case, that of RCS keyword scrubbing, which uses "p4 fstat" to extract type information. Fix it by calling wildcard_encode() on the raw filename. Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano