1503817 - ./mach bootstrap fails to configure git

Status: RESOLVED FIXED

(Firefox Build System :: Bootstrap Configuration, defect)

Description

[Mark Banner (:standard8)]

Running ./mach bootstrap in a git-cinnabar based repository and electing to configure git fails with:

TypeError: configure_git() takes exactly 3 arguments (2 given)

  File "/Users/mark/dev/gecko/python/mozboot/mozboot/mach_commands.py", line 38, in bootstrap
    bootstrapper.bootstrap()
  File "/Users/mark/dev/gecko/python/mozboot/mozboot/bootstrap.py", line 414, in bootstrap
    configure_git(self.instance.which('git'), state_dir)

This is a regression from bug 1481425 which changed the amount of arguments passed into configure_git.

Comment 1

[Connor Sheehan [:sheehan]]

Attachment: Bug 1503817: add missing checkout directory argument to `configure_git` call r?glob

In bug 1481425 I added an argument to `configure_git` for
the root directory of the current Firefox checkout, so
we could check for and remove the MozReview commit message
hook. I overlooked one other call to that function in
`bootstrap.py`, which is now failing due to too few
arguments. This commit adds the missing parameter.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2659d4da0d78
add missing checkout directory argument to `configure_git` call r=glob

Comment 3

[Mark Banner (:standard8)]

Thanks Connor, I couldn't quite work out what the correct parameter was there when I looked earlier.

Comment 4

[Connor Sheehan [:sheehan]]

No problem, Mark - apologies for the bustage in the first place. :)

Comment 6

[Daniel Varga [:dvarga]]

https://hg.mozilla.org/mozilla-central/rev/2659d4da0d78