@@ -209,21 +209,6 @@ up_to_date () {
209209 fi
210210}
211211
212- # require_remote <nickname> <url>
213- require_remote () {
214- if test -z " $( git config remote." $1 " .url) "
215- then
216- git remote add -f " $1 " " $2 "
217- else
218- test " $2 " = " $( git config remote." $1 " .url) " ||
219- die " Incorrect URL for %s: %s\n" \
220- " $1 " " $( git config remote." $1 " .url) "
221-
222- git fetch " $1 "
223- fi ||
224- die " Could not fetch from %s\n" " $1 "
225- }
226-
227212whatis () {
228213 git show -s --pretty=' tformat:%h (%s, %ad)' --date=short " $@ "
229214}
@@ -414,77 +399,6 @@ build_and_test_64 () {
414399 fi'
415400}
416401
417- needs_upload_permissions () {
418- grep -q ' ^machine api\.github\.com$' " $HOME " /_netrc &&
419- grep -q ' ^machine uploads\.github\.com$' " $HOME " /_netrc ||
420- die " Missing GitHub entries in ~/_netrc\n"
421- }
422-
423- tag_git () { # [--force]
424- force=
425- branch_to_use=
426- while case " $1 " in
427- -f|--force)
428- force=--force
429- ;;
430- --use-branch=* ) branch_to_use=" ${1#* =} " ;;
431- -* ) die " Unknown option: %s\n" " $1 " ;;
432- * ) break ;;
433- esac ; do shift ; done
434- test $# = 0 ||
435- die " Expected no argument, got $# : %s\n" " $* "
436-
437- sdk=" $sdk64 " require w3m
438-
439- build_extra_dir=" $sdk64 /usr/src/build-extra"
440- (cd " $build_extra_dir " &&
441- sdk= pkgpath=$PWD ff_main_branch) ||
442- die " Could not update build-extra\n"
443-
444- git_src_dir=" $sdk64 /usr/src/MINGW-packages/mingw-w64-git/src/git"
445- (cd " $git_src_dir " &&
446- require_remote upstream https://github.com/git/git &&
447- require_remote git-for-windows \
448- https://github.com/git-for-windows/git) || exit
449-
450- case " $branch_to_use " in
451- * @* )
452- git " $dir_option " fetch --tags \
453- " ${branch_to_use#*@ } " " ${branch_to_use%%@* } " ||
454- die " Could not fetch '%s' from '%s'\n" \
455- " ${branch_to_use%%@* } " " ${branch_to_use#*@ } "
456- branch_to_use=FETCH_HEAD
457- ;;
458- esac
459- branch_to_use=" ${branch_to_use:- git-for-windows/ main} "
460-
461- next_version=" $( sed -ne \
462- ' 1s/.* \(v[0-9][.0-9]*\(-rc[0-9]*\)\?\)(\([0-9][0-9]*\)) .*/\1.windows.\3/p' \
463- -e ' 1s/.* \(v[0-9][.0-9]*\(-rc[0-9]*\)\?\) .*/\1.windows.1/p' \
464- < " $build_extra_dir /ReleaseNotes.md" ) "
465- ! git --git-dir=" $git_src_dir " rev-parse --verify \
466- refs/tags/" $next_version " > /dev/null 2>&1 ||
467- test -n " $force " ||
468- die " Already tagged: %s\n" " $next_version "
469-
470- notes=" $( " $sdk64 /git-cmd.exe" --command=usr\\ bin\\ sh.exe -l -c \
471- ' markdown </usr/src/build-extra/ReleaseNotes.md |
472- LC_CTYPE=C w3m -dump -cols 72 -T text/html | \
473- sed -n "/^Changes since/,\${:1;p;n;/^Changes/q;b1}"' ) "
474-
475- tag_message=" $( printf " %s\n\n%s" \
476- " $( sed -n ' 1s/.*\(Git for Windows v[^ ]*\).*/\1/p' \
477- < " $build_extra_dir /ReleaseNotes.md" ) " " $notes " ) " &&
478- (cd " $git_src_dir " &&
479- sign_option= &&
480- if git config user.signingKey > /dev/null; then sign_option=-s; fi &&
481- git tag -m " $tag_message " -a $sign_option $force \
482- " $next_version " $branch_to_use ) ||
483- die " Could not tag %s in %s\n" " $next_version " " $git_src_dir "
484-
485- echo " Created tag $next_version " >&2
486- }
487-
488402pacman_helper () {
489403 " $sdk64 /git-cmd.exe" --command=usr\\ bin\\ bash.exe -l \
490404 " $sdk64 /usr/src/build-extra/pacman-helper.sh" " $@ "
0 commit comments