push/pull: adjust missing upstream help text to changed interface

Michael J Gruber · peff · commit a3a4391abfeb · 2012-11-08T11:32:38.000-05:00
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/&lt;branch&gt;

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

    git branch --set-upstream-to=origin/&lt;branch&gt; nsiv2

Reported-by: Jeroen van der Ham &lt;vdham@uva.nl&gt;
Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ See git-${cmd}(1) for details`
`80`	`80`
`81`	`81`	`If you wish to set tracking information for this branch you can do so with:`
`82`	`82`
`83`		`- git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>`
	`83`	`+ git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}`
`84`	`84`	`"`
`85`	`85`	`fi`
`86`	`86`	`exit 1`