Index: git_common.py |
diff --git a/git_common.py b/git_common.py |
index d9ad7ce8608e6e19f93b28e66095169d973334c0..0b27941f0c60ad5e8bfa9364beb2a51d193088fd 100644 |
--- a/git_common.py |
+++ b/git_common.py |
@@ -428,15 +428,24 @@ def freeze(): |
except subprocess2.CalledProcessError: |
pass |
+ add_errors = False |
+ try: |
+ run('add', '-A', '--ignore-errors') |
+ except subprocess2.CalledProcessError: |
+ add_errors = True |
+ |
try: |
- run('add', '-A') |
run('commit', '--no-verify', '-m', FREEZE + '.unindexed') |
took_action = True |
except subprocess2.CalledProcessError: |
pass |
+ ret = [] |
+ if add_errors: |
+ ret.append('Failed to index some unindexed files.') |
if not took_action: |
- return 'Nothing to freeze.' |
+ ret.append('Nothing to freeze.') |
+ return ' '.join(ret) or None |
def get_branch_tree(): |