Cleanup index.lock after running libgit update-index

(fixes issue #2668)

Signed-off-by: Sup Yut Sum <[email protected]>
Signed-off-by: Sven Strickroth <[email protected]>

Author: ch3cooli

ext/gitdll/gitdll.c

@@ -48,6 +48,8 @@ extern int die_is_recursing_dll(void);
 extern void free_all_pack();
 extern void reset_git_env();
 extern void drop_attr_stack();
+extern void git_atexit_dispatch();
+extern void git_atexit_clear();
 extern void invalidate_ref_cache(const char* submodule);
 extern void cmd_log_init(int argc, const char** argv, const char* prefix, struct rev_info* rev, struct setup_revision_opt* opt);
 extern int estimate_commit_count(struct rev_info* rev, struct commit_list* list);
@@ -756,6 +758,12 @@ int git_run_cmd(char *cmd, char *arg)
 	return -1;
 }
 
+void git_exit_cleanup(void)
+{
+	git_atexit_dispatch();
+	git_atexit_clear();
+}
+
 int git_for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
 {
 	return for_each_reflog_ent(ref,fn,cb_data);

ext/gitdll/gitdll.h

@@ -166,6 +166,7 @@ GITDLL_API int git_free_exclude_list(EXCLUDE_LIST which);
 GITDLL_API int git_get_notes(GIT_HASH hash, char **p_note);
 
 GITDLL_API int git_run_cmd(char *cmd, char *arg);
+GITDLL_API void git_exit_cleanup();
 
 #define REF_ISSYMREF 01
 #define REF_ISPACKED 02

ext/tgit

@@ -38,6 +38,7 @@ Released: unreleased
  * Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasing
  * Fixed issue #2690: Failed to Show log from repository browser when that repository is located on a drive
  * Fixed issue #2655: Resolve does not work on multiple selection during deleted-modifed conflict resolution
+ * Fixed issue #2668: TortoiseGit commit with git-lfs files, show me a error: ".git/index.lock" file exist
 
 = Release 1.8.16.0 =
 Released: 2015-11-01

src/Changelog.txt

@@ -2442,10 +2442,13 @@ int CGit::RefreshGitIndex()
 		CAutoLocker lock(g_Git.m_critGitDllSec);
 		try
 		{
-			return [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
+			int result = [] { return git_run_cmd("update-index","update-index -q --refresh"); }();
+			git_exit_cleanup();
+			return result;
 
 		}catch(...)
 		{
+			git_exit_cleanup();
 			return -1;
 		}