From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Sep 2007 07:05:49 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git/git-p4
X-Git-Tag: v1.5.4-rc0~456
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b5ef6ac978012475660a36583b2174e9bd8188a5;p=git.git

Merge branch 'master' of git://repo.or.cz/git/git-p4

* 'master' of git://repo.or.cz/git/git-p4:
  git-p4: Added support for automatically importing newly appearing perforce branches.
  git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
  git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
  git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
  git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
  git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
  git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
  git-p4: Always call 'p4 sync ...' before submitting to Perforce.
---

b5ef6ac978012475660a36583b2174e9bd8188a5