From a6f5a167053fb2602f98671815f79d3382412d62 Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Mon, 17 Dec 2018 15:00:16 +0100 Subject: [PATCH] HACKING: replace refs/publish/master with refs/for/master refs/publish/master is deprecated and gives a warning in newer Gerrit. Replace with refs/for/master. Change-Id: I56871cc6e80c014ba81f4458230cd67dc318ecb3 Suggested-by: Andreas Fritiofson Signed-off-by: Jerome Forissier Reviewed-on: http://openocd.zylin.com/4810 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- HACKING | 4 ++-- tools/initial.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HACKING b/HACKING index b7ef0705b0..86bfde5f66 100644 --- a/HACKING +++ b/HACKING @@ -122,12 +122,12 @@ to instruct git locally how to send off the changes. -# Add a new remote to git using Gerrit username: @code git remote add review ssh://USERNAME@openocd.zylin.com:29418/openocd.git -git config remote.review.push HEAD:refs/publish/master +git config remote.review.push HEAD:refs/for/master @endcode Or with http only: @code git remote add review http://USERNAME@openocd.zylin.com/p/openocd.git -git config remote.review.push HEAD:refs/publish/master +git config remote.review.push HEAD:refs/for/master @endcode The http password is configured from your gerrit settings - http://openocd.zylin.com/#/settings/http-password. \note If you want to simplify http access you can also add your http password to the url as follows: diff --git a/tools/initial.sh b/tools/initial.sh index 9580c9a9c4..446b98bdaf 100755 --- a/tools/initial.sh +++ b/tools/initial.sh @@ -12,7 +12,7 @@ add_remote() remote_exist=`grep remote .git/config | grep review | wc -l` if [ "x$remote_exist" = "x0" ] ; then git remote add review ssh://$USERNAME@openocd.zylin.com:29418/openocd.git - git config remote.review.push HEAD:refs/publish/master + git config remote.review.push HEAD:refs/for/master else echo "Remote review exists" fi -- 2.30.2