git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Deprecated help message
@ 2012-11-06  9:44 Jeroen van der Ham
  2012-11-06 10:29 ` [PATCH] push/pull: adjust missing upstream help text to changed interface Michael J Gruber
  0 siblings, 1 reply; 5+ messages in thread
From: Jeroen van der Ham @ 2012-11-06  9:44 UTC (permalink / raw)
  To: git

Hi,

It seems I hit a deprecated help message:

% git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream nsiv2 origin/<branch>

% git branch --set-upstream nsiv2 origin/nsiv2
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
Branch nsiv2 set up to track remote branch nsiv2 from origin.

Jeroen.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] push/pull: adjust missing upstream help text to changed interface
  2012-11-06  9:44 Deprecated help message Jeroen van der Ham
@ 2012-11-06 10:29 ` Michael J Gruber
  2012-11-06 14:45   ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Michael J Gruber @ 2012-11-06 10:29 UTC (permalink / raw)
  To: git; +Cc: Jeroen van der Ham, Jeff King

In case of a missing upstream, the git-parse-remote script suggests:

If you wish to set tracking information for this branch you can do so
with:

    git branch --set-upstream nsiv2 origin/<branch>

But --set-upstream is deprectated. Change the suggestion to:

    git branch --set-upstream-to=origin/<branch> nsiv2

Reported-by: Jeroen van der Ham <vdham@uva.nl>
---
Yes, I'm in low hanging fruits mood.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 git-parse-remote.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 484b2e6..0e87e09 100644
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -80,7 +80,7 @@ See git-${cmd}(1) for details
 
 If you wish to set tracking information for this branch you can do so with:
 
-    git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>
+    git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
 "
 	fi
 	exit 1
-- 
1.8.0.226.gba44ac5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] push/pull: adjust missing upstream help text to changed interface
  2012-11-06 10:29 ` [PATCH] push/pull: adjust missing upstream help text to changed interface Michael J Gruber
@ 2012-11-06 14:45   ` Junio C Hamano
  2012-11-07  8:22     ` Michael J Gruber
  0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2012-11-06 14:45 UTC (permalink / raw)
  To: Michael J Gruber, git; +Cc: Jeroen van der Ham, Jeff King



Michael J Gruber <git@drmicha.warpmail.net> wrote:

>Yes, I'm in low hanging fruits mood.
>
>Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>

It is called tying loose ends, and is very important. Very much appreciated.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] push/pull: adjust missing upstream help text to changed interface
  2012-11-06 14:45   ` Junio C Hamano
@ 2012-11-07  8:22     ` Michael J Gruber
  2012-11-07 10:44       ` Jeff King
  0 siblings, 1 reply; 5+ messages in thread
From: Michael J Gruber @ 2012-11-07  8:22 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Jeroen van der Ham, Jeff King

Junio C Hamano venit, vidit, dixit 06.11.2012 15:45:
> 
> 
> Michael J Gruber <git@drmicha.warpmail.net> wrote:
> 
>> Yes, I'm in low hanging fruits mood.
>>
>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> 
> It is called tying loose ends, and is very important. Very much appreciated.

;)

By the way: The gotcha with the signed-off-by after the note is due to
my old format-patch-notes being tripped up by the recent restructuring;
your version in next get's it right. I've dumped my old branch, and I
hope the maintainer in chief will shuffle around the s-o-b where it belongs.

Michael

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] push/pull: adjust missing upstream help text to changed interface
  2012-11-07  8:22     ` Michael J Gruber
@ 2012-11-07 10:44       ` Jeff King
  0 siblings, 0 replies; 5+ messages in thread
From: Jeff King @ 2012-11-07 10:44 UTC (permalink / raw)
  To: Michael J Gruber; +Cc: Junio C Hamano, git, Jeroen van der Ham

On Wed, Nov 07, 2012 at 09:22:38AM +0100, Michael J Gruber wrote:

> Junio C Hamano venit, vidit, dixit 06.11.2012 15:45:
> > 
> > 
> > Michael J Gruber <git@drmicha.warpmail.net> wrote:
> > 
> >> Yes, I'm in low hanging fruits mood.
> >>
> >> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> > 
> > It is called tying loose ends, and is very important. Very much appreciated.
> 
> ;)
> 
> By the way: The gotcha with the signed-off-by after the note is due to
> my old format-patch-notes being tripped up by the recent restructuring;
> your version in next get's it right. I've dumped my old branch, and I
> hope the maintainer in chief will shuffle around the s-o-b where it belongs.

Yes, will do. Thanks.

-Peff

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-11-07 10:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-06  9:44 Deprecated help message Jeroen van der Ham
2012-11-06 10:29 ` [PATCH] push/pull: adjust missing upstream help text to changed interface Michael J Gruber
2012-11-06 14:45   ` Junio C Hamano
2012-11-07  8:22     ` Michael J Gruber
2012-11-07 10:44       ` Jeff King

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).