[DIM PATCH 3/3] dim: Don't use --set-upstream

Sean Paul seanpaul at chromium.org
Mon May 14 14:00:46 UTC 2018


According to the manpage, it's deprecated, so use --set-upstream-to
instead.

Signed-off-by: Sean Paul <seanpaul at chromium.org>
---
 dim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index 171557774ea4..7cb22bb85d14 100755
--- a/dim
+++ b/dim
@@ -1277,7 +1277,9 @@ function dim_create_branch
 	fi
 
 	$DRY git branch $branch $start
-	$DRY git push $remote +$branch --set-upstream
+	$DRY git push $remote +$branch
+	$DRY git checkout $branch
+	$DRY git branch --set-upstream-to="$remote/$branch"
 
 
 	cd $DIM_PREFIX/drm-rerere
-- 
Sean Paul, Software Engineer, Google / Chromium OS



More information about the dim-tools mailing list