summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2020-03-05 23:09:45 +0100
committerDylan Baker <[email protected]>2020-03-06 16:43:10 -0800
commitf8f4c317fb0c5825da64edc3c24733e276326fe2 (patch)
tree6fb2d75f4e733c2c70f5b41a4cd0ee435443611a
parentf64c5d0cf6386af26b68d98c933e3199eb309596 (diff)
bin/gen_release_notes.py: fix commit list command
Fixes: 86079447da1e00d49db0 ("scripts: Add a gen_release_notes.py script") Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4069> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4069> (cherry picked from commit d7a70fbb2305604ce75b1a0dbcd03e2ebe71f92a)
-rw-r--r--.pick_status.json2
-rwxr-xr-xbin/gen_release_notes.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 1d77bccbe90..7a5bf0ea606 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -283,7 +283,7 @@
"description": "bin/gen_release_notes.py: fix commit list command",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "86079447da1e00d49db0cbff9a102eb4e71e8702"
},
diff --git a/bin/gen_release_notes.py b/bin/gen_release_notes.py
index f7b9237071c..09344c419ea 100755
--- a/bin/gen_release_notes.py
+++ b/bin/gen_release_notes.py
@@ -125,7 +125,7 @@ TEMPLATE = Template(textwrap.dedent("""\
async def gather_commits(version: str) -> str:
p = await asyncio.create_subprocess_exec(
- 'git', 'log', f'mesa-{version}..', '--grep', r'Closes: \(https\|#\).*',
+ 'git', 'log', '--oneline', f'mesa-{version}..', '--grep', r'Closes: \(https\|#\).*',
stdout=asyncio.subprocess.PIPE)
out, _ = await p.communicate()
assert p.returncode == 0, f"git log didn't work: {version}"