Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / builtin-update-index.c

diff --git a/builtin-update-index.c b/builtin-update-index.c
index c76879ed7f8fb4fc46bd4193746e6bbfa50fa01a..c3a14c74ed00db592db55a018db37657148a9900 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -377,8 +377,6 @@ static void read_index_info(int line_termination)
                                die("git-update-index: unable to update %s",
                                    path_name);
                }
-               if (path_name != ptr)
-                       free(path_name);
                continue;
 
        bad_line:
@@ -740,7 +738,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                            get_index_file(), strerror(lock_error));
                }
                if (write_cache(newfd, active_cache, active_nr) ||
-                   close(newfd) || commit_locked_index(lock_file))
+                   commit_locked_index(lock_file))
                        die("Unable to write new index file");
        }