Git 2.17.1

diff --git a/builtin/difftool.c b/builtin/difftool.c
index b2d3ba7539d5b9cdc7ec6f910ee24510e709f76c..bcc79d1888f2217bcb380ffb1e7178c100a41e8e 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -616,7 +616,6 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
                        if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||
                            write_locked_index(&wtindex, &lock, COMMIT_LOCK)) {
                                ret = error("could not write %s", buf.buf);
-                               rollback_lock_file(&lock);
                                goto finish;
                        }
                        changed_files(&wt_modified, buf.buf, workdir);