Check for errors and skip commit hooks

dmeybohm · Mar 25, 2018 · c439340 · c439340
1 parent cd40591
commit c439340
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/editorconfig_git_preserve_history/git.py b/editorconfig_git_preserve_history/git.py
@@ -38,7 +38,7 @@ def impersonate_and_write_commit(self, files: List[str]) -> None:
         impersonator_name = run(['git', 'config', 'user.name'])[0]
         message = self.message + "\n\nOriginal-Commit: " + self.commit + "\n" + \
             "Impersonator: {} <{}>".format(impersonator_name, impersonator_email)
-        args = ['git', 'commit', '--date', self.date, '--author', self.author,
+        args = ['git', 'commit', '-n', '--date', self.date, '--author', self.author,
                 '--message', message]
         run(args + files)
 

diff --git a/editorconfig_git_preserve_history/main.py b/editorconfig_git_preserve_history/main.py
@@ -68,7 +68,11 @@ def find_and_write_commits():
                                                               change_file,
                                                               line_numbers)
             with open(change_file, 'wb') as f:
-                f.write(new_contents)
+                try:
+                    f.write(new_contents)
+                except IOError as e:
+                    print("Error writing "+change_file)
+                    raise e
         gitinfo.impersonate_and_write_commit(change.files())