Re: [PATCH v2 11/19] pull: check if in unresolved merge state
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:05:14
Paul Tan [off-list ref] writes:
quoted hunk
@@ -422,6 +423,14 @@ int cmd_pull(int argc, const char **argv, const char *prefix) parse_repo_refspecs(argc, argv, &repo, &refspecs); + git_config(git_default_config, NULL); + + if (read_cache_unmerged()) + die_resolve_conflict("Pull"); + + if (file_exists(git_path("MERGE_HEAD"))) + die_conclude_merge(); + if (!opt_ff.len) config_get_ff(&opt_ff);
Hmph. If you are going to do the git_config() call yourself, it might make more sense to define git_pull_config() callback and parse the pull.ff yourself, updating the use of the lazy git_config_get_value() API you introduced in patch 10/19. The above "might" is stronger than my usual "might"; I am undecided yet before reading the remainder of the series.