From: Jeff King <peff@peff.net>
Date: Sat, 20 Nov 2010 04:10:12 GMT
Subject: Re: [RFC] rebase: use @{upstream} if no upstream specified
Message-ID: <20101120041011.GA20725@sigill.intra.peff.net>
In-Reply-To: <AANLkTikWYVyCf9mueoAHjGcQuNOdPFyQrmtW79As4RG-@mail.gmail.com>

On Fri, Nov 19, 2010 at 07:26:57PM -0500, Martin von Zweigbergk wrote:

> Yes, I did try that and I noticed that it worked, but it helps to know
> that it is not just by accident. I realize I was not very clear, but
> what I really was wondering if there is any advantage to using
> "git for-each-ref --format='%(upstream)' ${branch_name}" (as used by
> git pull) as compared to "git rev-parse @{upstream}" as suggested by
> Yann. ($branch_name in this case would be the current branch.)

No, I don't think there is a reason to prefer one over the other these
days. When the instance in git-parse-remote was written (e9460a6,
2009-06-12) @{upstream} did not yet exist (it came in 28fb843,
2009-09-10). So for-each-ref was the only way to get the informationa

I would use whichever one seems clearer in your context.

-Peff