Hi,
On Thu, 3 Jul 2008, Junio C Hamano wrote:
> "Dana How" <danahow@xxxxxxxxx> writes:
>
> > I was surprised to see Dscho advocating removing this feature
> > altogether. Others proposed other command sequences which avoided :/ .
> > If :/ is now going to be extended and thus perhaps more likely to
> > appear in scripts, is now the time to change it to ? which has no
> > other special meaning to git?
>
> There are number of problems with ":/" notation, but my biggest gripe is
> that it is only slightly better than "give back a random commit".
Well, it _is_ better than that: it gives you the _newest_ matching commit,
provided that the people involved in those commits maintained their NTP
settings correctly.
The _real_ gripe you should have with the notation is what I pointed out
already: it is _ill_-defined. It _could_ match more than one commit, but
matches only _one_.
> As Dscho mentioned, --grep works much better and instead of saying:
>
> $ git diff ':/send-email' HEAD
>
> we can say:
>
> $ git diff \
> $(git log --pretty=format:%H -1 --grep=send-email master next) HEAD
>
> The error behaviour is somewhat different between the two, though.
> When you misspell what to grep, the command substitution will give empty
> and you would get an unexpected result. Being built-in, ':/' syntax can
> say "I do not find anything that match" fairly easily, and the command
> substitution version has to say something ugly like:
>
> $ git diff \
> $(
> x=$(git log --pretty=format:%H -1 --grep=send-email master next)
> case "$x" in
> ('') echo 0000000000000000000000000000000000000000 ;;
> (?) echo $x ;; esac
> ) HEAD
>
> to get a similar effect.
Again, this is the wrong way to think about it. If you grep for things,
you can get 0..infty matches, not necessarily 1.
To assume that you get at least one match is already an error.
Letting that funny "case" syntax slip by, I would suggest this command
line instead:
$ $(git log --pretty=format:'git diff %H..;' --grep=send-email \
master next)
> But the point is that you can extend it easily with the :path suffix if
> you wanted to:
>
> $ git show \
> $(git log --pretty=format:%H -1 \
> --grep=send-email):git-send-email.perl
Again, I would rather suggest pulling the ":<path>" into the format, as I
did _already_ in another mail, robustifying the whole command.
> So in short, ':/' is limited (cannot be suffixed with :path, cannot be
> told to dig down from named revs, etc.) but you can do what ':/' cannot
> do fairly easily with command substitution.
>
> However, $(git pick --all --grep=something), without suffixed modifiers
> such as ~$N and :$path, may still be common enough that it might deserve a
> short-hand ':/' (and that is why we have it).
>
> If people do not find that short-hand useful, I am not strongly opposed to
> the idea of dropping it. I personally find the notation not very useful
> cute hack anyway ;-).
It was a cute hack, and before --grep it was actually useful.
Now it is not any more,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
