From: Paul Tan <pyokagan@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stephen Robin <stephen.robin@gmail.com>
Subject: Re: [PATCH v2 11/19] pull: check if in unresolved merge state
Date: Wed, 10 Jun 2015 23:12:06 +0800 [thread overview]
Message-ID: <CACRoPnSQd_YEp4mNFbqDZtBJGztkHLXWbDojcAJRNvpynFRCew@mail.gmail.com> (raw)
In-Reply-To: <xmqqr3pjocgm.fsf@gitster.dls.corp.google.com>
On Wed, Jun 10, 2015 at 10:38 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Paul Tan <pyokagan@gmail.com> writes:
>>
>>> @@ -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.
>
> Let me clarify the above with s/stronger/with much less certainty/;
Uh, I have no idea what a "strong might" or a "less certain might" is. :-/
Parsing all the config values with a git_config() callback function is
certainly possible, but I was under the impression that we are moving
towards migrating use of all the git_config() callback loops to the
git_config_get_X() API.
In this case though, we have to use git_config() to initialize the
advice.resolveConflict config setting, but I don't see why it must be
in conflict with the above goal.
Thanks,
Paul
next prev parent reply other threads:[~2015-06-10 15:12 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 6:48 [PATCH v2 00/19] Make git-pull a builtin Paul Tan
2015-06-03 6:48 ` [PATCH v2 01/19] parse-options-cb: implement parse_opt_pass_strbuf() Paul Tan
2015-06-09 23:11 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 02/19] parse-options-cb: implement parse_opt_pass_argv_array() Paul Tan
2015-06-03 16:56 ` Stefan Beller
2015-06-09 23:16 ` Junio C Hamano
2015-06-10 7:11 ` Paul Tan
2015-06-10 8:03 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 03/19] argv-array: implement argv_array_pushv() Paul Tan
2015-06-03 6:48 ` [PATCH v2 04/19] pull: implement skeletal builtin pull Paul Tan
2015-06-10 0:23 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 05/19] pull: implement fetch + merge Paul Tan
2015-06-09 23:27 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 06/19] pull: pass verbosity, --progress flags to fetch and merge Paul Tan
2015-06-09 23:36 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 07/19] pull: pass git-merge's options to git-merge Paul Tan
2015-06-03 6:48 ` [PATCH v2 08/19] pull: pass git-fetch's options to git-fetch Paul Tan
2015-06-03 17:16 ` Stefan Beller
2015-06-03 6:48 ` [PATCH v2 09/19] pull: error on no merge candidates Paul Tan
2015-06-09 23:56 ` Junio C Hamano
2015-06-13 5:52 ` Paul Tan
2015-06-03 6:48 ` [PATCH v2 10/19] pull: support pull.ff config Paul Tan
2015-06-09 23:59 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 11/19] pull: check if in unresolved merge state Paul Tan
2015-06-10 1:29 ` Junio C Hamano
2015-06-10 14:38 ` Junio C Hamano
2015-06-10 15:12 ` Paul Tan [this message]
2015-06-10 17:14 ` Junio C Hamano
2015-06-14 7:44 ` Paul Tan
2015-06-03 6:48 ` [PATCH v2 12/19] pull: fast-forward working tree if head is updated Paul Tan
2015-06-03 6:48 ` [PATCH v2 13/19] pull: implement pulling into an unborn branch Paul Tan
2015-06-10 1:31 ` Junio C Hamano
2015-06-03 6:48 ` [PATCH v2 14/19] pull: set reflog message Paul Tan
2015-06-03 6:48 ` [PATCH v2 15/19] pull: teach git pull about --rebase Paul Tan
2015-06-10 1:56 ` Junio C Hamano
2015-06-10 7:55 ` Paul Tan
2015-06-10 14:44 ` Junio C Hamano
2015-06-10 15:35 ` Paul Tan
2015-06-10 16:13 ` Junio C Hamano
2015-06-10 23:02 ` Junio C Hamano
2015-06-03 6:49 ` [PATCH v2 16/19] pull: configure --rebase via branch.<name>.rebase or pull.rebase Paul Tan
2015-06-03 6:49 ` [PATCH v2 17/19] pull --rebase: exit early when the working directory is dirty Paul Tan
2015-06-03 10:27 ` Kevin Daudt
2015-06-10 5:53 ` Kevin Daudt
2015-06-03 6:49 ` [PATCH v2 18/19] pull --rebase: error on no merge candidate cases Paul Tan
2015-06-03 17:38 ` Stefan Beller
2015-06-03 6:49 ` [PATCH v2 19/19] pull: remove redirection to git-pull.sh Paul Tan
2015-06-03 17:49 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACRoPnSQd_YEp4mNFbqDZtBJGztkHLXWbDojcAJRNvpynFRCew@mail.gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
--cc=stephen.robin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).