git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] Allow passing of --directory to git-am.
Date: Thu, 04 Dec 2008 16:11:36 -0800	[thread overview]
Message-ID: <7viqpzbhvr.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <49386ABE.2050404@fs.ei.tum.de> (Simon Schubert's message of "Fri, 05 Dec 2008 00:41:50 +0100")

Simon 'corecode' Schubert <corecode@fs.ei.tum.de> writes:

> Junio C Hamano wrote:
>> Simon 'corecode' Schubert <corecode@fs.ei.tum.de> writes:
>>
>>> You mean not storing/restoring the flags across an invocation?  No,
>>> that's a different thing.  My patch only adds the --directory option,
>>> it does not fix the previously existing bug.
>>
>> The question is if it _introduces_ a bug that the directory given in the
>> initial invocation of "git am --directory=foo" is lost if an patch does
>> not apply and you need to manually resolve and continue.
>>
>> If it does not introduce such a bug, you do not have the same issue as the
>> old patch.  Otherwise you have the same issue as the old patch.  The
>> question was if you have the same issue or you don't.  Yes?  No?
>
> Yes, that's the issue.  In this regard it behaves bug-compatible with
> the -p and -C options.

If that is the case, and assuming that propagating -C/-p would be a good
idea (which I am not sure yet), the patch I sent out earlier (which was
flawed somewhat; it should use "$git_apply_opt_extra" where it invokes the
"git apply" command) with necessary fix would serve as the basis to
implement --directory=<dir>?

  reply	other threads:[~2008-12-05  0:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-04 18:48 [PATCH] Allow passing of --directory to git-am Simon 'corecode' Schubert
2008-12-04 18:51 ` Jeff King
2008-12-04 19:27 ` Junio C Hamano
2008-12-04 22:26   ` Simon 'corecode' Schubert
2008-12-04 22:33     ` Junio C Hamano
2008-12-04 23:14       ` Junio C Hamano
2008-12-04 23:36         ` [PATCH - DONTUSE] git-am: propagate -C/-p as well Junio C Hamano
2008-12-04 23:41       ` [PATCH] Allow passing of --directory to git-am Simon 'corecode' Schubert
2008-12-05  0:11         ` Junio C Hamano [this message]
2008-12-05  0:16           ` Simon 'corecode' Schubert
2008-12-04 19:35 ` Jakub Narebski
2008-12-04 22:25   ` Simon 'corecode' Schubert
2008-12-04 22:46     ` Jakub Narebski
  -- strict thread matches above, loose matches on Subject: below --
2008-12-04 17:04 Simon 'corecode' Schubert
2008-12-04 18:28 ` Boyd Stephen Smith Jr.

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7viqpzbhvr.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=corecode@fs.ei.tum.de \
    --cc=git@vger.kernel.org \
    /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.
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 NNTP newsgroup(s).