linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [git pull] vfs.git regression fix
Date: Sat, 16 Jan 2016 13:44:58 +0000	[thread overview]
Message-ID: <20160116134458.GK17997@ZenIV.linux.org.uk> (raw)
In-Reply-To: <CA+55aFwK4sNh1+iUZJcsvdMRJ7cfi9_THGcHR6Cj5KrfF1wh=g@mail.gmail.com>

On Fri, Jan 15, 2016 at 01:08:44PM -0800, Linus Torvalds wrote:
> On Fri, Jan 15, 2016 at 1:00 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> >
> > Buggy scripts, actually.  The thing that generates them takes a branch
> > name as argument; turns out that it (pretty much by accident) treats the
> > missing argument as HEAD.  Which tends to give reasonable diffstat and
> > shortlog, so I hadn't spotted the missing check until now.
> 
> You could try "git request-pull". It _used_ to have somewhat similar
> issues, especially when the local branch had not made it to the remote
> point yet, but it should be good now. It actually warns if the remote
> name you give doesn't contain what the local branch contanis etc.

Having checked how git request-pull reacts to missing branch argument...
Very similar bug there - it gives stats for HEAD and URI with no branch
name.  Might've been fixed in later versions (it's 2.1.4 here - debian-stable)

FWIW, the main inconvenience with git request-pull is that it still needs
s/gitolite@ra.kernel.org:/git:\/\/git.kernel.org/ postprocessing.  It mimics
the git push, but the remote you are pushing to probably won't be usable for
pulling by others.  Looks like it would be useful to have something like
	pull_url = git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
to go with
	url = gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/viro/vfs.git
in .git/config, settable by something in git remote.  OTOH, it's possible to
emulate by setting an extra remote and using git push vfs <...> for pushes,
while doing git request-pull origin vfs-pull <...> for pull requests...

  reply	other threads:[~2016-01-16 13:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-15 20:18 [git pull] vfs.git regression fix Al Viro
2016-01-15 20:41 ` Linus Torvalds
2016-01-15 21:00   ` Al Viro
2016-01-15 21:08     ` Linus Torvalds
2016-01-16 13:44       ` Al Viro [this message]
2016-01-16 19:05         ` Linus Torvalds
2016-01-18  7:49         ` Tomi Valkeinen

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=20160116134458.GK17997@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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).