commit --interactive: properly update the index before commiting

g-pape · gitster · commit d5350fd2b3a4 · 2008-05-27T22:32:47.000-07:00
When adding files through git commit --interactive, and 'quit' afterwards, the message in the editor of the commit message indicates that many (maybe all) files are deleted from the tree. Dismissing that and running git commit afterwards does the right thing. This commit fixes git commit --interactive to properly update the index before commiting. Reported by Jiří Paleček through http://bugs.debian.org/480429 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin-commit.c b/builtin-commit.c
@@ -219,6 +219,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
 
 	if (interactive) {
 		interactive_add(argc, argv, prefix);
+		if (read_cache() < 0)
+			die("index file corrupt");
 		commit_style = COMMIT_AS_IS;
 		return get_index_file();
 	}

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ static char prepare_index(int argc, const char argv, const char prefix)`
`219`	`219`
`220`	`220`	`if (interactive) {`
`221`	`221`	`interactive_add(argc, argv, prefix);`
	`222`	`+ if (read_cache() < 0)`
	`223`	`+ die("index file corrupt");`
`222`	`224`	`commit_style = COMMIT_AS_IS;`
`223`	`225`	`return get_index_file();`
`224`	`226`	`}`