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

From

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

Date

Nov 6, 2012, 10:29 UTC

Message-ID

<bd710e422cb8ca0cec4cf52ea3c9ddb284d6c60d.1352197626.git.git@drmicha.warpmail.net>

In-Reply-To

<00F68AED-5D59-44F2-B0F1-E541881BC2CB@uva.nl>

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

    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