[tor-commits] [tor/master] scripts: Fix rename_c_identifier.py uncommitted warning

[nickm at torproject.org]

commit 7a6e1f2491094fbf705e2ef4b3fd770faf48f1b7
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jun 30 13:45:16 2020 -0400

    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 at torproject.org>
---
 scripts/maint/rename_c_identifier.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/rename_c_identifier.py b/scripts/maint/rename_c_identifier.py
index 77802e10f..779468930 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