Merge branch 'nd/repo-clear-keep-the-index'

gitster · gitster · commit 0abb96289327 · 2018-05-30T14:04:05.000+09:00
the_repository-&gt;index is not a allocated piece of memory but
repo_clear() indiscriminately attempted to free(3) it, which has
been corrected.

* nd/repo-clear-keep-the-index:
  repository: fix free problem with repo_clear(the_repository)
diff --git a/repository.c b/repository.c
@@ -238,7 +238,8 @@ void repo_clear(struct repository *repo)
 
 	if (repo->index) {
 		discard_index(repo->index);
-		FREE_AND_NULL(repo->index);
+		if (repo->index != &the_index)
+			FREE_AND_NULL(repo->index);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,8 @@ void repo_clear(struct repository *repo)`
`238`	`238`
`239`	`239`	`if (repo->index) {`
`240`	`240`	`discard_index(repo->index);`
`241`		`- FREE_AND_NULL(repo->index);`
	`241`	`+ if (repo->index != &the_index)`
	`242`	`+ FREE_AND_NULL(repo->index);`
`242`	`243`	`}`
`243`	`244`	`}`
`244`	`245`