git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: "yaneurabeya ." <yanegomi@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Fwd: Errors when diff'ing arbitrary upstream remotes are not intuitive if git pull --all hasn't been done
Date: Fri, 25 Oct 2013 02:14:08 -0400	[thread overview]
Message-ID: <20131025061407.GE11810@sigill.intra.peff.net> (raw)
In-Reply-To: <CAGH67wRwb1A9CzAfod_XLRVFBRyoEron8tmM+NbMGOeKDVf2Hg@mail.gmail.com>

On Thu, Oct 24, 2013 at 11:07:05AM -0700, yaneurabeya . wrote:

>     I added an arbitrary upstream remote thinking that I could just
> git diff the upstream remote's master. Turns out I needed to run git
> pull --all in order to be able to diff the file (I forgot that step).

Actually, you can just run "git fetch"; you just need to fetch the
commits from the remote, but you do not need to merge them (and pull is
a fetch plus a merge).

>     Could this error message be improved for interactive commands by
> first checking to see whether or not the path starts with a remote,
> then recommend that the remote be pulled?

That might be worth doing. We cannot definitely say the branch exists
without hitting the network (which we would not want to do in the
general case), but I think it is reasonable for git to give suggestions
(we could also give a "did you mean X..." for near-typos, as we do for
typo-ed commands like "git dif".

If you do try it, please don't just check for the remote name, but
actually complete the right-hand side of the fetch refspec for each
remote. They are equivalent in the default config, but aren't
necessarily so (and there has been talk of adjusting the layout of
remote refspecs). I don't recall offhand what functions we have to help
you, but I believe Johan (cc'd) was working in this area recently and
might be able to say more.

> If this seems sane, I could whip up a patch and post it in a github
> pull request.

If you do write a patch, please send it to the list, as the github
repository is a mirror, and actual development happens here. Details are
in Documentation/SubmittingPatches.

-Peff

  reply	other threads:[~2013-10-25  6:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAGH67wSf_RQigCmqRZKOpHdV9ELqE=078mkpwA4dfnUr=AvGVQ@mail.gmail.com>
2013-10-24 18:07 ` Fwd: Errors when diff'ing arbitrary upstream remotes are not intuitive if git pull --all hasn't been done yaneurabeya .
2013-10-25  6:14   ` Jeff King [this message]
2013-10-25  6:14     ` Jeff King
2013-10-25  7:03       ` Johan Herland
2013-10-25  7:10         ` Jeff King
2013-10-25  7:25           ` Johan Herland

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=20131025061407.GE11810@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=yanegomi@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.
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).