Thread (35 messages) flat view 35 messages, 5 authors, 2016-06-15

Re: [PATCH 02/11] revert: Lose global variables "commit" and "me"

From: Christian Couder <hidden>
Date: 2016-06-15 22:51:01

On Sunday 10 April 2011 17:11:48 Ramkumar Ramachandra wrote:
quoted hunk ↗ jump to hunk
@@ -546,10 +547,13 @@ static int prepare_revs(struct rev_info *revs)
 	return 0;
 }

-static int read_and_refresh_cache(const char *me)
+static int read_and_refresh_cache(void)
 {
 	static struct lock_file index_lock;
 	int index_fd = hold_locked_index(&index_lock, 0);
+	const char *me;
+
+	me = (cmd_opts.action == REVERT ? "revert" : "cherry-pick");
It looks like this patch will not compile as cmd_opts is introduced in patch 
03/11.
 	if (read_index_preload(&the_index, NULL) < 0)
 		return error(_("%s: failed to read the index"), me);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL,
Best regards,
Christian.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help