aboutsummaryrefslogtreecommitdiff
path: root/scripts/maint
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-06-30 13:45:16 -0400
committerDavid Goulet <dgoulet@torproject.org>2020-06-30 13:48:22 -0400
commit7a6e1f2491094fbf705e2ef4b3fd770faf48f1b7 (patch)
treeea6ad100e791e57688cd1ae8f2d4fdbed2c9ec6b /scripts/maint
parent96876d3ad79c14722cf14d9705df291b38ec4a82 (diff)
downloadtor-7a6e1f2491094fbf705e2ef4b3fd770faf48f1b7.tar.gz
tor-7a6e1f2491094fbf705e2ef4b3fd770faf48f1b7.zip
scripts: Fix rename_c_identifier.py uncommitted warning
Only warn when we actually want a commit _and_ there are uncommitted changes found. Else, it is fine to rename if the script is not creating a commit. Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'scripts/maint')
-rwxr-xr-xscripts/maint/rename_c_identifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/maint/rename_c_identifier.py b/scripts/maint/rename_c_identifier.py
index 77802e10f3..7794689303 100755
--- a/scripts/maint/rename_c_identifier.py
+++ b/scripts/maint/rename_c_identifier.py
@@ -239,7 +239,7 @@ def main(argv):
print("I require an even number of identifiers.", file=sys.stderr)
return 1
- if any_uncommitted_changes():
+ if args.commit and any_uncommitted_changes():
print("Uncommitted changes found. Not running.", file=sys.stderr)
return 1