Date: Fri, 25 Jul 2014 15:23:49 GMT From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271373 - soc2014/op/tools Message-ID: <201407251523.s6PFNntL008125@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: op Date: Fri Jul 25 15:23:49 2014 New Revision: 271373 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271373 Log: added branch name support to tools/svn-cherry-pick-from-git.csh Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com> Modified: soc2014/op/tools/svn-cherry-pick-from-git.csh Modified: soc2014/op/tools/svn-cherry-pick-from-git.csh ============================================================================== --- soc2014/op/tools/svn-cherry-pick-from-git.csh Fri Jul 25 15:22:48 2014 (r271372) +++ soc2014/op/tools/svn-cherry-pick-from-git.csh Fri Jul 25 15:23:49 2014 (r271373) @@ -7,6 +7,7 @@ set svndir="/usr/data/source/svn/op/freebsd-base" git format-patch -o ${td} ${ver} +set git_branch=`git branch | awk '/\*/{print $2}'` cd ${svndir} @@ -26,7 +27,7 @@ echo "press ENTER to continue" $< set git_id=`sed -n -e '/From/s/From \([0-9a-f]*\) .*/\1/p' ${i}` - git --git-dir=${GIT_DIR} show --format="%s%n%n%b%ngit: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch" -s ${git_id} > /tmp/svn-commit-message-${git_id}.txt + git --git-dir=${GIT_DIR} show --format="%s%n%n%b%ngit: https://github.com/opntr/opBSD/tree/${git_branch}" -s ${git_id} > /tmp/svn-commit-message-${git_id}.txt echo cat /tmp/svn-commit-message-${git_id}.txt echo "press ENTER to continue"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407251523.s6PFNntL008125>