git-p4 pull request

git-p4 pull request

[Simon Hausmann]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Hi,

The following changes since commit 7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3:
  Shawn O. Pearce (1):
        Merge branch 'maint'

are available in the git repository at:

  git://repo.or.cz/git/git-p4.git git-p4

Chris Pettitt (1):
      git-p4 support for perforce renames.

Simon Hausmann (1):
      git-p4: When skipping a patch as part of "git-p4 submit" make sure we 
correctly revert to the previous state of the files using "p4 revert".

 contrib/fast-import/git-p4 |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)


These changes fit nicely into master I would say.

Thanks,
Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

git-p4 pull request

[Simon Hausmann]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

The following changes since commit fe61935007b6803ce116e233316e4ff51de02be6:
  Junio C Hamano (1):
        Merge branch 'maint'

are available in the git repository at:

  git://repo.or.cz/git/git-p4.git git-p4

Chris Pettitt (2):
      git-p4: Add a helper function to parse the full git diff-tree output.
      git-p4: Detect changes to executable bit and include them in p4 submit.

 contrib/fast-import/git-p4 |   93 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 89 insertions(+), 4 deletions(-)


Chris implemented support for representing mode changes in git in submits to
Perforce. Fits well into master IMHO.

Thanks,
Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

git-p4 pull request

[Simon Hausmann]

[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]

The following changes since commit a5e407988b35b7353bd03c770afc647670c25981:
  Jim Meyering (1):
        git-cvsserver: detect/diagnose write failure, etc.

are available in the git repository at:

  git://people.freedesktop.org/~hausmann/git-p4 master

Scott Lamb (2):
      git-p4: use subprocess in p4CmdList
      git-p4: input to "p4 files" by stdin instead of arguments

Simon Hausmann (3):
      git-p4: Cleanup, make listExistingP4Branches a global function for later use.
      git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
      git-p4: Cleanup, used common function for listing imported p4 branches

 contrib/fast-import/git-p4 |  129 ++++++++++++++++++++++++--------------------
 1 files changed, 70 insertions(+), 59 deletions(-)


I have used Scotts changes for two days now and had no problems at all.
Based on Alex Riesen's suggestion they are a nice solution around the commandline
limits when calling the p4 client.

The other three changes fix a rather ugly bug when importing multiple depot
paths through p4 branch mappings where it could happen in the end that changes
that were done in git were submitted into the wrong depot paths in perforce itself
due to a faulty rebase onto the wrong git branch.

Would be great if those changes could be included in master.


Thanks,
Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: git-p4 pull request

[Junio C Hamano]

Thanks, pulled (but not pushed out yet).