From 3d083655f10ad6ff0eef1f4a628d5635890ab4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hunor=20Csomort=C3=A1ni?= Date: Fri, 2 Dec 2022 16:28:00 +0100 Subject: [PATCH] check-style: Improve the proposed git-rebase command Include the sha used for the dry-run instead of using 'origin/main'. Part-of: --- check-style.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/check-style.py b/check-style.py index a4daefaa4..cabcbb7cc 100755 --- a/check-style.py +++ b/check-style.py @@ -120,7 +120,7 @@ def reformat_chunks(chunks, rewrite): return changed -parser = argparse.ArgumentParser(description='Check code style.') +parser = argparse.ArgumentParser(description='Check code style. Needs uncrustify installed.') parser.add_argument('--sha', metavar='SHA', type=str, help='SHA for the commit to compare HEAD with') parser.add_argument('--dry-run', '-d', type=bool, @@ -146,7 +146,11 @@ if dry_run is not True and rewrite is True: subprocess.run(["git", "commit", "--all", "--amend", "-C", "HEAD"], stdout=subprocess.DEVNULL) os._exit(0) elif dry_run is True and changed is True: - print ("\nIssue the following command in your local tree to apply the suggested changes (needs uncrustify installed):\n\n $ git rebase origin/main --exec \"./check-style.py -r\" \n") + print(f""" +Issue the following command in your local tree to apply the suggested changes: + + $ git rebase {sha} --exec "./check-style.py -r" +""") os._exit(-1) os._exit(0)