зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1773874: build(angle): explicitly set `git-log`'s `format`, `decorate`, and `abbrev-commit` options in `vendor_from_git` r=jgilbert
I discovered that my local Git configuration changed the output of the `vendor_from_git` module when it was used to vendor in ANGLE source. That's probably not something we want! Let's insulate ourselves from the settings that at least I'm aware could be relevant here. Differential Revision: https://phabricator.services.mozilla.com/D184173
This commit is contained in:
Родитель
cf21b96710
Коммит
89b510d1be
|
@ -64,10 +64,22 @@ def record_cherry_picks(dir_in_gecko, merge_base_origin):
|
|||
)
|
||||
|
||||
mb_info = run_checked(
|
||||
"git", "log", "{}~1..{}".format(merge_base, merge_base), stdout=subprocess.PIPE
|
||||
"git",
|
||||
"log",
|
||||
"--format=medium",
|
||||
"--no-decorate",
|
||||
"--no-abbrev-commit",
|
||||
"{}~1..{}".format(merge_base, merge_base),
|
||||
stdout=subprocess.PIPE,
|
||||
).stdout
|
||||
cherries = run_checked(
|
||||
"git", "log", merge_base + "..", stdout=subprocess.PIPE
|
||||
"git",
|
||||
"log",
|
||||
"--format=medium",
|
||||
"--no-decorate",
|
||||
"--no-abbrev-commit",
|
||||
merge_base + "..",
|
||||
stdout=subprocess.PIPE,
|
||||
).stdout
|
||||
|
||||
with open(log_path, "wb") as f:
|
||||
|
|
Загрузка…
Ссылка в новой задаче