submodule: convert stage_updated_gitmodules to take a struct index_state

bmwill · gitster · commit 3b8317a9e6f1 · 2017-12-12T12:35:20.000-08:00
Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/mv.c b/builtin/mv.c
@@ -291,7 +291,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	}
 
 	if (gitmodules_modified)
-		stage_updated_gitmodules();
+		stage_updated_gitmodules(&the_index);
 
 	if (active_cache_changed &&
 	    write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
diff --git a/builtin/rm.c b/builtin/rm.c
@@ -382,7 +382,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 		}
 		strbuf_release(&buf);
 		if (gitmodules_modified)
-			stage_updated_gitmodules();
+			stage_updated_gitmodules(&the_index);
 	}
 
 	if (active_cache_changed) {
diff --git a/submodule.c b/submodule.c
@@ -143,9 +143,9 @@ int remove_path_from_gitmodules(const char *path)
 	return 0;
 }
 
-void stage_updated_gitmodules(void)
+void stage_updated_gitmodules(struct index_state *istate)
 {
-	if (add_file_to_cache(GITMODULES_FILE, 0))
+	if (add_file_to_index(istate, GITMODULES_FILE, 0))
 		die(_("staging updated .gitmodules failed"));
 }
 
diff --git a/submodule.h b/submodule.h
@@ -37,7 +37,7 @@ extern int is_gitmodules_unmerged(const struct index_state *istate);
 extern int is_staging_gitmodules_ok(const struct index_state *istate);
 extern int update_path_in_gitmodules(const char *oldpath, const char *newpath);
 extern int remove_path_from_gitmodules(const char *path);
-extern void stage_updated_gitmodules(void);
+extern void stage_updated_gitmodules(struct index_state *istate);
 extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
 		const char *path);
 extern int git_default_submodule_config(const char *var, const char *value, void *cb);

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ int cmd_mv(int argc, const char *argv, const char prefix)`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`if (gitmodules_modified)`
`294`		`- stage_updated_gitmodules();`
	`294`	`+ stage_updated_gitmodules(&the_index);`
`295`	`295`
`296`	`296`	`if (active_cache_changed &&`
`297`	`297`	`write_locked_index(&the_index, &lock_file, COMMIT_LOCK))`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ int cmd_rm(int argc, const char *argv, const char prefix)`
`382`	`382`	`}`
`383`	`383`	`strbuf_release(&buf);`
`384`	`384`	`if (gitmodules_modified)`
`385`		`- stage_updated_gitmodules();`
	`385`	`+ stage_updated_gitmodules(&the_index);`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`if (active_cache_changed) {`
Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,9 @@ int remove_path_from_gitmodules(const char *path)`
`143`	`143`	`return 0;`
`144`	`144`	`}`
`145`	`145`
`146`		`-void stage_updated_gitmodules(void)`
	`146`	`+void stage_updated_gitmodules(struct index_state *istate)`
`147`	`147`	`{`
`148`		`- if (add_file_to_cache(GITMODULES_FILE, 0))`
	`148`	`+ if (add_file_to_index(istate, GITMODULES_FILE, 0))`
`149`	`149`	`die(_("staging updated .gitmodules failed"));`
`150`	`150`	`}`
`151`	`151`