From ffcb63b460ae7f944e99d9f829039137df9e3b21 Mon Sep 17 00:00:00 2001 From: buhl <221842+buhl@users.noreply.github.com> Date: Sat, 9 Jan 2021 23:22:20 +0100 Subject: [PATCH] Removing "git-vendor" from "vendor/github.com/brettlangdon/git-vendor" --- .../brettlangdon/git-vendor/LICENSE | 21 -- .../brettlangdon/git-vendor/Makefile | 79 ------- .../brettlangdon/git-vendor/README.md | 91 -------- .../brettlangdon/git-vendor/bin/git-vendor | 201 ------------------ .../git-vendor/etc/bash_completion.sh | 4 - .../brettlangdon/git-vendor/install.sh | 6 - .../brettlangdon/git-vendor/man/git-vendor.1 | 163 -------------- .../git-vendor/man/git-vendor.html | 0 .../brettlangdon/git-vendor/man/git-vendor.md | 95 --------- 9 files changed, 660 deletions(-) delete mode 100644 vendor/github.com/brettlangdon/git-vendor/LICENSE delete mode 100644 vendor/github.com/brettlangdon/git-vendor/Makefile delete mode 100644 vendor/github.com/brettlangdon/git-vendor/README.md delete mode 100755 vendor/github.com/brettlangdon/git-vendor/bin/git-vendor delete mode 100755 vendor/github.com/brettlangdon/git-vendor/etc/bash_completion.sh delete mode 100755 vendor/github.com/brettlangdon/git-vendor/install.sh delete mode 100644 vendor/github.com/brettlangdon/git-vendor/man/git-vendor.1 delete mode 100644 vendor/github.com/brettlangdon/git-vendor/man/git-vendor.html delete mode 100644 vendor/github.com/brettlangdon/git-vendor/man/git-vendor.md diff --git a/vendor/github.com/brettlangdon/git-vendor/LICENSE b/vendor/github.com/brettlangdon/git-vendor/LICENSE deleted file mode 100644 index edc76dd73e..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Brett Langdon - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/vendor/github.com/brettlangdon/git-vendor/Makefile b/vendor/github.com/brettlangdon/git-vendor/Makefile deleted file mode 100644 index d3c91d62c3..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# Majority of this script was borrowed from git-extra: -# https://github.com/tj/git-extras/blob/98d0d8c642ea2643f513bc41fcb9dd3078cf2e59/Makefile -PREFIX ?= /usr/local -BINPREFIX ?= "$(PREFIX)/bin" -MANPREFIX ?= "$(PREFIX)/share/man/man1" -SYSCONFDIR ?= $(PREFIX)/etc -BINS = $(wildcard bin/git-*) -MANS = $(wildcard man/git-*.md) -MAN_HTML = $(MANS:.md=.html) -MAN_PAGES = $(MANS:.md=.1) - -COMMANDS = $(subst bin/, , $(BINS)) - -default: install - -docs: $(MAN_HTML) $(MAN_PAGES) - -install: - @mkdir -p $(DESTDIR)$(MANPREFIX) - @mkdir -p $(DESTDIR)$(BINPREFIX) - @echo "... installing bins to $(DESTDIR)$(BINPREFIX)" - @echo "... installing man pages to $(DESTDIR)$(MANPREFIX)" - $(eval TEMPFILE := $(shell mktemp -q $${TMPDIR:-/tmp}/git-vendor.XXXXXX 2>/dev/null || mktemp -q)) - @# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts - @chmod 775 $(TEMPFILE) - $(eval EXISTED_ALIASES := $(shell \ - git config --get-regexp 'alias.*' | awk '{print "git-" substr($$1, 7)}')) - @$(foreach COMMAND, $(COMMANDS), \ - disable=''; \ - if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \ - read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \ - test "$$answer" = 'n' -o "$$answer" = 'N' && disable="true"; \ - fi; \ - if test -z "$$disable"; then \ - echo "... installing $(COMMAND)"; \ - cat bin/$(COMMAND) > $(TEMPFILE); \ - cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \ - fi; \ - ) - @if [ -z "$(wildcard man/git-*.1)" ]; then \ - echo "WARNING: man pages not created, use 'make docs' (which requires 'ronn' ruby lib)"; \ - else \ - cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \ - echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \ - fi - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d - cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-vendor - -man/%.html: man/%.md - ronn \ - --manual "Git Vendor" \ - --html \ - --pipe \ - $< > $@ - -man/%.1: man/%.md - ronn -r \ - --manual "Git Vendor" \ - --pipe \ - $< > $@ - -uninstall: - @$(foreach BIN, $(BINS), \ - echo "... uninstalling $(DESTDIR)$(BINPREFIX)/$(notdir $(BIN))"; \ - rm -f $(DESTDIR)$(BINPREFIX)/$(notdir $(BIN)); \ - ) - @$(foreach MAN, $(MAN_PAGES), \ - echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \ - rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \ - ) - rm -f $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-vendor - -clean: docclean - -docclean: - rm -f man/*.1 - rm -f man/*.html - -.PHONY: default docs clean docclean install uninstall diff --git a/vendor/github.com/brettlangdon/git-vendor/README.md b/vendor/github.com/brettlangdon/git-vendor/README.md deleted file mode 100644 index 56b38de996..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/README.md +++ /dev/null @@ -1,91 +0,0 @@ -git-vendor -========== -A git command for managing vendored dependencies. - -`git-vendor` is a wrapper around `git-subtree` commands for checking out and updating vendored dependencies. - -By default `git-vendor` conforms to the pattern used for vendoring golang dependencies: - -* Dependencies are stored under `vendor/` directory in the repo. -* Dependencies are stored under the fully qualified project path. - * e.g. `https://github.com/brettlangdon/forge` will be stored under `vendor/github.com/brettlangdon/forge`. - -## Usage -See https://brettlangdon.github.io/git-vendor for the current MAN page documentation. - -`git-vendor` provides the following commands: - -* `git vendor add [--prefix ] []` - add a new vendored dependency. -* `git vendor list []` - list current vendored dependencies, their source, and current vendored ref. -* `git vendor update []` - update a vendored dependency. - -## Installation -Manually: - -```bash -git clone https://github.com/brettlangdon/git-vendor -cd ./git-vendor -make -``` - -One-liner: -```bash -curl -sSL https://git.io/vzN5m | sudo bash /dev/stdin -``` - -[Homebrew](http://brew.sh) (thanks to @liamstask): -```bash -brew install git-vendor -``` - -## Example - -```bash -$ # Checkout github.com/brettlangdon/forge@v0.1.6 under vendor/github.com/brettlangdon/forge -$ git vendor add forge https://github.com/brettlangdon/forge v0.1.6 -+ git subtree add --prefix vendor/github.com/brettlangdon/forge --message 'Add "forge" from "https://github.com/brettlangdon/forge@v0.1.6" - -git-vendor-name: forge -git-vendor-dir: vendor/github.com/brettlangdon/forge -git-vendor-repository: https://github.com/brettlangdon/forge -git-vendor-ref: v0.1.6 -' https://github.com/brettlangdon/forge v0.1.6 --squash -git fetch https://github.com/brettlangdon/forge v0.1.6 -warning: no common commits -remote: Counting objects: 405, done. -remote: Total 405 (delta 0), reused 0 (delta 0), pack-reused 404 -Receiving objects: 100% (405/405), 68.31 KiB | 0 bytes/s, done. -Resolving deltas: 100% (227/227), done. -From https://github.com/brettlangdon/forge - * tag v0.1.6 -> FETCH_HEAD -Added dir 'vendor/github.com/brettlangdon/forge' - -$ # List current vendored dependencies -$ git vendor list -forge@v0.1.6: - name: forge - dir: vendor/github.com/brettlangdon/forge - repo: https://github.com/brettlangdon/forge - ref: v0.1.6 - commit: 3335840c5f0ad9e821006588f1b16a3385d9c318 - -$ # Update existing dependency to a newer version -$ git vendor update forge v0.1.7 -From https://github.com/brettlangdon/forge - * tag v0.1.7 -> FETCH_HEAD -Merge made by the 'recursive' strategy. - vendor/github.com/brettlangdon/forge/forge_test.go | 2 ++ - vendor/github.com/brettlangdon/forge/scanner.go | 4 ++++ - vendor/github.com/brettlangdon/forge/test.cfg | 1 + - 3 files changed, 7 insertions(+) - -$ # List current vendored dependencies -$ git vendor list -forge@v0.1.7: - name: forge - dir: vendor/github.com/brettlangdon/forge - repo: https://github.com/brettlangdon/forge - ref: v0.1.7 - commit: 071c5f108e0af39bf67a87fc766ea9bfb72b9ee7 - -``` diff --git a/vendor/github.com/brettlangdon/git-vendor/bin/git-vendor b/vendor/github.com/brettlangdon/git-vendor/bin/git-vendor deleted file mode 100755 index 566aa59972..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/bin/git-vendor +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/sh -# -# git-vendor.sh: manage vendored repos via git-subtree -# -# Copyright (c) 2016 Brett Langdon -# -_usage() -{ - cat <] [] - git vendor list [] - git vendor remove - git vendor update [] -EOF -} - -PATH=$PATH:$(git --exec-path) -. git-sh-setup -require_work_tree - -case "$1" in - ""|"--help") _usage && exit ;; -esac - -command="$1" -shift -case "$command" in - "add"|"list"|"remove"|"update") ;; - *) >&2 echo "error: unknown command \"$command\"" && _usage && exit 1 ;; -esac - -prefix="vendor" -if [ "$1" = "--prefix" ]; then - prefix="$2" - shift; shift -fi - -vendor_names_from_log() -{ - name= - dir= - git log --grep="^git-vendor-name: .*\$" \ - --pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD | - while read a b junk; do - case "$a" in - START) ;; - git-vendor-name:) name="$b" ;; - git-vendor-dir:) dir="$b" ;; - END) - # Only consider dependencies which still exist on disk - if [ -d "$dir" ]; then - echo "$name" - fi - name= - dir= - ;; - esac - done | sort -u -} - -vendor_git_log_first() -{ - name="$1" - git log -1 --grep="^git-vendor-name: $name\$" --pretty=format:'START %H%n%s%n%n%b%nEND%n' HEAD -} - -cmd_add() -{ - require_clean_work_tree - name="$1" - repository="$2" - ref="master" - if [ "$3" != "" ]; then - ref="$3" - fi - if [ $# -lt 2 ]; - then - die "Incorrect options provided: git vendor add []" - fi - - dir="$prefix/$(echo "$repository" | sed -E 's/^[a-zA-Z]+((:\/\/)|@)//' | sed 's/:/\//' | sed -E 's/\.git$//')" - message="\ -Add \"$name\" from \"$repository@$ref\" - -git-vendor-name: $name -git-vendor-dir: $dir -git-vendor-repository: $repository -git-vendor-ref: $ref -" - set -x - git subtree add --prefix "$dir" --message "$message" "$repository" "$ref" --squash -} - -cmd_list() -{ - showOnly="$1" - for name in $(vendor_names_from_log); - do - vendor_git_log_first "$name" | - while read a b junk; do - case "$a" in - START) commit="$b" ;; - git-vendor-name:) name="$b" ;; - git-vendor-dir:) dir="$b" ;; - git-vendor-ref:) ref="$b" ;; - git-vendor-repository:) repository="$b" ;; - END) - if [ ! -z "$repository" ]; - then - if [ -z "$showOnly" -o "$showOnly" = "$name" ]; then - printf "$name@$ref:\n" - printf "\tname:\t$name\n" - printf "\tdir:\t$dir\n" - printf "\trepo:\t$repository\n" - printf "\tref:\t$ref\n" - printf "\tcommit:\t$commit\n" - printf "\n" - fi - fi - name= - dir= - ref= - commit= - repository= - ;; - esac - done - done; - -} - -cmd_update() -{ - require_clean_work_tree - name="$1" - ref="master" - if [ "$2" != "" ]; then - ref="$2" - fi - if [ $# -lt 1 ]; then - die "Incorrect options provided: git vendor update []" - fi - vendor_git_log_first "$name" | - while read a b junk; do - case "$a" in - START) ;; - git-vendor-dir:) dir="$b" ;; - git-vendor-repository:) repository="$b" ;; - END) - # Make sure the dependency exists on disk - if [ ! -d "$dir" ]; then - die "Dependency \"$1\" is missing from \"$dir\"" - fi - - if [ ! -z "$repository" ]; - then - message="\ -Update \"$name\" from \"$repository@$ref\" - -git-vendor-name: $name -git-vendor-dir: $dir -git-vendor-repository: $repository -git-vendor-ref: $ref -" - git subtree pull --prefix "$dir" --message "$message" "$repository" "$ref" --squash - break - fi - ;; - esac - done -} - -cmd_remove() -{ - require_clean_work_tree - name="$1" - if [ $# -lt 1 ]; then - die "Incorrect options provided: git vendor remove " - fi - vendor_git_log_first "$name" | - while read a b junk; do - case "$a" in - START) ;; - git-vendor-dir:) dir="$b" ;; - END) - # Make sure the dependency exists - if [ ! -d "$dir" ]; then - die "Dependency \"$1\" is missing from \"$dir\"" - fi - git rm -rf "$dir" - git commit --message "Removing \"$name\" from \"$dir\"" - break - ;; - esac - done -} - -# Run the command -"cmd_$command" "$@" diff --git a/vendor/github.com/brettlangdon/git-vendor/etc/bash_completion.sh b/vendor/github.com/brettlangdon/git-vendor/etc/bash_completion.sh deleted file mode 100755 index 8db8d0644e..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/etc/bash_completion.sh +++ /dev/null @@ -1,4 +0,0 @@ -_git_vendor() -{ - __gitcomp "add list update" -} diff --git a/vendor/github.com/brettlangdon/git-vendor/install.sh b/vendor/github.com/brettlangdon/git-vendor/install.sh deleted file mode 100755 index 7db82430a5..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/install.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -cd /tmp \ - && rm -rf git-vendor \ - && git clone https://github.com/brettlangdon/git-vendor &> /dev/null \ - && cd git-vendor \ - && make install diff --git a/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.1 b/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.1 deleted file mode 100644 index b33fb3abbb..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.1 +++ /dev/null @@ -1,163 +0,0 @@ -.\" generated with Ronn/v0.7.3 -.\" http://github.com/rtomayko/ronn/tree/0.7.3 -. -.TH "GIT\-VENDOR" "1" "February 2016" "" "Git Vendor" -. -.SH "NAME" -\fBgit\-vendor\fR \- manage vendored dependency subtrees -. -.SH "SYNOPSIS" -\fBgit\-vendor add [\-\-prefix ] []\fR -. -.P -\fBgit\-vendor list []\fR -. -.P -\fBgit\-vendor remove \fR -. -.P -\fBgit\-vendor update []\fR -. -.SH "DESCRIPTION" -Manage any repository dependencies with \fBgit\-subtree\fR\. -. -.P -\fBgit\-vendor\fR follows the same vendoring pattern that is used in the Go community\. Dependencies are stored under \fBvendor/\fR\. For example, the dependency of \fBhttps://github\.com/brettlangdon/forge\.git\fR will be stored under \fBvendor/github\.com/brettlangdon/forge\fR by default\. -. -.P -\fBgit\-vendor\fR is unable to \fBlist\fR or \fBupdate\fR any dependencies it has not added, the reason is that \fBgit\-vendor\fR adds special commit messages so that it can track existing dependencies\. -. -.SH "COMMANDS" -add [\-\-prefix ] [] -. -.P -Add a new vendored dependency -. -.P -list [] -. -.P -List all existing vendored dependencies and their current version\. Limit show dependency to \fB\fR if provided\. -. -.P -remove -. -.P -Remove the named vendored dependency\. -. -.P -update -. -.P -Update the vendored dependency to a different version\. -. -.SH "OPTIONS" -\-\-prefix -. -.P -Directory to pull dependencies in under (e\.g\. \fBvendor\fR or \fBthird_party\fR, etc)\. [default: \fBvendor\fR] -. -.P - -. -.P -A name to provide the vendored dependency to use when listing/updating\. -. -.P - -. -.P -The repository url to vendor\. e\.g\. \fBhttps://github\.com//\fR (supports \fBhttp://\fR, \fBhttps://\fR \fBgit://\fR and \fBgit@\fR protocols)\. -. -.P - -. -.P -The ref to vendor\. e\.g\. \fBmaster\fR, \fBv1\.0\.2\fR, etc\. [default: \fBmaster\fR] -. -.SH "EXAMPLES" -Adding a new dependency at a specific git tagged version: -. -.IP "" 4 -. -.nf - -$ git vendor add forge https://github\.com/brettlangdon/forge v0\.1\.4 -. -.fi -. -.IP "" 0 -. -.P -Adding a new dependency under a different directory than \fBvendor/\fR: -. -.IP "" 4 -. -.nf - -$ git vendor add \-\-prefix third_party forge https://github\.com/brettlangdon/forge -. -.fi -. -.IP "" 0 -. -.P -Updating an existing dependency to a specific git tagged version: -. -.IP "" 4 -. -.nf - -$ git vendor update forge v0\.1\.7 -. -.fi -. -.IP "" 0 -. -.P -Updating a dependency to \fBmaster\fR: -. -.IP "" 4 -. -.nf - -$ git vendor update forge -. -.fi -. -.IP "" 0 -. -.P -Removing a dependency: -. -.IP "" 4 -. -.nf - -$ git vendor remove forge -. -.fi -. -.IP "" 0 -. -.P -List all existing dependencies: -. -.IP "" 4 -. -.nf - -$ git vendor list -. -.fi -. -.IP "" 0 -. -.SH "AUTHOR" -Written by Brett Langdon \fIme@brett\.is\fR -. -.SH "REPORTING BUGS" -<\fIhttps://github\.com/brettlangdon/git\-vendor/issues\fR> -. -.SH "SEE ALSO" -<\fIhttps://github\.com/brettlangdon/git\-vendor\fR> diff --git a/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.html b/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.md b/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.md deleted file mode 100644 index 74c319ef9c..0000000000 --- a/vendor/github.com/brettlangdon/git-vendor/man/git-vendor.md +++ /dev/null @@ -1,95 +0,0 @@ -git-vendor(1) -- manage vendored dependency subtrees -================================ - -## SYNOPSIS - -`git-vendor add [--prefix ] []` - -`git-vendor list []` - -`git-vendor remove ` - -`git-vendor update []` - -## DESCRIPTION - - Manage any repository dependencies with `git-subtree`. - - `git-vendor` follows the same vendoring pattern that is used in the Go community. Dependencies are stored under `vendor/`. For example, the dependency of `https://github.com/brettlangdon/forge.git` will be stored under `vendor/github.com/brettlangdon/forge` by default. - - `git-vendor` is unable to `list` or `update` any dependencies it has not added, the reason is that `git-vendor` adds special commit messages so that it can track existing dependencies. - -## COMMANDS - - add [--prefix <dir>] <name> <repository> [<ref>] - - Add a new vendored dependency - - list [<name>] - - List all existing vendored dependencies and their current version. Limit show dependency to `` if provided. - - remove <name> - - Remove the named vendored dependency. - - update <dir> <ref> - - Update the vendored dependency to a different version. - - -## OPTIONS - - --prefix <dir> - - Directory to pull dependencies in under (e.g. `vendor` or `third_party`, etc). [default: `vendor`] - - <name> - - A name to provide the vendored dependency to use when listing/updating. - - <repository> - - The repository url to vendor. e.g. `https://github.com//` (supports `http://`, `https://` `git://` and `git@` protocols). - - <ref> - - The ref to vendor. e.g. `master`, `v1.0.2`, etc. [default: `master`] - -## EXAMPLES - - Adding a new dependency at a specific git tagged version: - - $ git vendor add forge https://github.com/brettlangdon/forge v0.1.4 - - Adding a new dependency under a different directory than `vendor/`: - - $ git vendor add --prefix third_party forge https://github.com/brettlangdon/forge - - Updating an existing dependency to a specific git tagged version: - - $ git vendor update forge v0.1.7 - - Updating a dependency to `master`: - - $ git vendor update forge - - Removing a dependency: - - $ git vendor remove forge - - List all existing dependencies: - - $ git vendor list - -## AUTHOR - -Written by Brett Langdon - -## REPORTING BUGS - -<> - -## SEE ALSO - -<>