git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Wincent Colaiuta <win@wincent.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH 1/3] Rename patch_update_file function to patch_update_pathspec
Date: Sun, 25 Nov 2007 10:11:09 -0800	[thread overview]
Message-ID: <7vzlx2mc02.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 1195996542-86074-2-git-send-email-win@wincent.com

Wincent Colaiuta <win@wincent.com> writes:

> The patch_update_file function really works on pathspecs, not files, so
> rename it to reflect its actual purpose.

I do not think this is a correct change.  patch_update_file() should
work on files not pathspecs.

A list of exact pathnames are valid pathspecs, and because the matching
function takes exact match first, if you feed a command
(e.g. diff-files) paths expanded from the pathspec given by the user,
you should be able to get desired results, no?

patch_update_cmd() grabs list of modified _files_, not pathspecs.  Then
the user chooses the ones to select hunks from via list_and_choose(),
and you may want to pretend that everything was chosen if you are
operating with pathspec and with --patch option.  Iterating over them is
iterating over files, not pathspecs, at that point.

Have you tried the one that is in 'next'?  I think it does the right
thing except "the bogus pathspec validation at the beginning" part as
far as the pathspec handling is concerned.

I sent out two fixes on top of the series.

  parent reply	other threads:[~2007-11-25 18:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-25 13:15 [PATCH 0/3] Updates to git-add--interactive Wincent Colaiuta
2007-11-25 13:15 ` [PATCH 1/3] Rename patch_update_file function to patch_update_pathspec Wincent Colaiuta
2007-11-25 13:15   ` [PATCH 2/3] Move pathspec validation into interactive_add Wincent Colaiuta
2007-11-25 13:15     ` [PATCH 3/3] Add "--patch" option to git-add--interactive Wincent Colaiuta
2007-11-25 18:11   ` Junio C Hamano [this message]
2007-11-25 18:07 ` [PATCH] builtin-add: fix command line building to call interactive Junio C Hamano
2007-11-25 18:27   ` Wincent Colaiuta
2007-11-25 18:36     ` Junio C Hamano
2007-11-25 19:02       ` Wincent Colaiuta
2007-11-25 19:48         ` Junio C Hamano
2007-11-26  4:14           ` Jeff King
2007-11-25 18:10 ` [PATCH] add -i: Fix running from a subdirectory Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2007-11-23 21:07 [PATCH v2] git-add--interactive pathspec and patch additions Junio C Hamano
2007-11-24 12:55 ` [PATCH 0/3] Updates to git-add--interactive Wincent Colaiuta
2007-11-24 12:55   ` [PATCH 1/3] Rename patch_update_file function to patch_update_pathspec Wincent Colaiuta

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=7vzlx2mc02.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=win@wincent.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.
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).