p4: respect init.defaultBranch

[dscho]

Just something I noticed while working on the big master -> main rename in the test suite.

Cc: Luke Diamand luke@diamand.org

[dscho]

/submit

[gitgitgadget]

Submitted as pull.782.git.1604824911359.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-782/dscho/git-p4-and-init.defaultBranch-v1

To fetch this version to local tag pr-782/dscho/git-p4-and-init.defaultBranch-v1:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-782/dscho/git-p4-and-init.defaultBranch-v1

[gitgitgadget]

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In `git p4 clone`, we hard-code the branch name `master` instead of
> looking what the _actual_ initial branch name is. Let's fix that.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---

Makes sense.  Will queue.  Thanks.

>     p4: respect init.defaultBranch
>     
>     Just something I noticed while working on the big master -> main rename
>     in the test suite.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-782%2Fdscho%2Fgit-p4-and-init.defaultBranch-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-782/dscho/git-p4-and-init.defaultBranch-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/782
>
>  git-p4.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 4433ca53de..52ddb1d7b2 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -4186,7 +4186,7 @@ def run(self, args):
>  
>          # create a master branch and check out a work tree
>          if gitBranchExists(self.branch):
> -            system([ "git", "branch", "master", self.branch ])
> +            system([ "git", "branch", currentGitBranch(), self.branch ])
>              if not self.cloneBare:
>                  system([ "git", "checkout", "-f" ])
>          else:
>
> base-commit: 7f7ebe054af6d831b999d6c2241b9227c4e4e08d

[gitgitgadget]

This branch is now known as js/p4-default-branch.

[gitgitgadget]

This patch series was integrated into seen via git@58f2882.

[gitgitgadget]

This patch series was integrated into next via git@a4b08b4.

[gitgitgadget]

This patch series was integrated into seen via git@bf9657e.

[gitgitgadget]

This patch series was integrated into seen via git@ca8870d.

[gitgitgadget]

This patch series was integrated into next via git@ca8870d.

[gitgitgadget]

This patch series was integrated into master via git@ca8870d.

[gitgitgadget]

Closed via ca8870d.