From nobody Tue Oct 11 15:46:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mn0X332jrz4dlVY; Tue, 11 Oct 2022 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mn0X32dJVz3vln; Tue, 11 Oct 2022 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665503219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2O5Ec52lCbaUDZ7a6QMPc8GDXt3rhOJ/rtQ4AZvSBQ=; b=i2V+7ff2kWllR8dAJn6lSSOS8oHBIy1DcHaFyHcnPGMY2kx5DYnAgoYlAbl8E6mgeBSOVA FB3cI3MXgsZ8Pcjmxq+XWAta+Z7uSAHL4VL1lJuCYoeDwoUEWVUqBIS/vnyCnY2fhUFUEy cqiURc1eHZFHhXwRXU1iJr7+fpNzFod291NuXR72slOLHtC1O9xFWG6cTwErgs8fEcryKL EsQLw/JkI1S+C0D9r/20Pzh/gGkKMAX5EEfJrH1IvOqrIyfNkiE6+CYU4EyFULZxBSKKzR wz8GNmZq6LHO/ponaVVwHt6cGBcdojG2j97mYFKLKaF/K7sspnlYpgRXlpwliA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mn0X31j6Dz11Fp; Tue, 11 Oct 2022 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29BFkx73038391; Tue, 11 Oct 2022 15:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BFkxrw038390; Tue, 11 Oct 2022 15:46:59 GMT (envelope-from git) Date: Tue, 11 Oct 2022 15:46:59 GMT Message-Id: <202210111546.29BFkxrw038390@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 3ccd12b970a9 - main - devel/git-extras: Update to 6.5.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ccd12b970a94128c78110c67eb5e45ea5e94b30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665503219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2O5Ec52lCbaUDZ7a6QMPc8GDXt3rhOJ/rtQ4AZvSBQ=; b=lAZDaq++JrqdfA59o3SkPcM8O9QPiTK9CLmVkv/0u158KtZzqIuVwwGIw7jr4fYnZEI0rH uBvbAtFnCOj7xmcUlt4JCP+HdXPYpYbO95/gJ34WGVeKlOocF3IpzcjblgZ/mKBqmHRYdJ AdQBzlKvJBUwLBk2lcPmfH28M4gTcq+A9N+YY/tOXkRz5ZXnD3VkZpZzvq+qA4KKpW3oPX J9tMTFoEzN9ui4eazD+yX81hBHMZ28jgxXvlDuPzlyvRAMfyU3m2NodW90e/9QcCX02Jm5 MDYa5Gadag51eP1S5/D3RMcdqd3IXk9ETEHtXTn08XAmojsHjbRcSSMJnr3B3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665503219; a=rsa-sha256; cv=none; b=iinIuMP3WWUmiEAcAlAJlCNtwoelxpW5MTgzB/byvMb7CcBTvZPHEqTXCtJeH6+bUaPwY9 g9tVny1IaCM0ZsFemWfy9XlXeh8yLRgTikEJDkWyfngU/CBko+KzReoBzBU/lGO5HMzH17 4/17B3PFHLcYEOvup6TjASfLkOrVphWi0U4MEOl7aZMPVymeeyarHFFyOJcH9c06QvxvQC X/eKvZFLFM06Uv4o3HMHNPj8kjbdkCwsb+LfcN3GdxuLJHYPXjEhvQ6UtdaSNcZiPFRpAY Q9b20jTap1dkwWnjKQQiVxUxRaInyhp2k3Sm4LTYkTRncGnM8ZlLmOnpwVBWHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ccd12b970a94128c78110c67eb5e45ea5e94b30 commit 3ccd12b970a94128c78110c67eb5e45ea5e94b30 Author: Igor Ostapenko AuthorDate: 2022-10-11 05:36:14 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-11 15:43:21 +0000 devel/git-extras: Update to 6.5.0 ChangeLog: https://github.com/tj/git-extras/releases/tag/6.5.0 * Include revert conflicts in git abort * fix(git-effort):fork: retry: Resource temporarily unavailable * git-sync --force will sync without interaction * fix(git-cp): keep the history of the files * git-bulk: previous refactor redirected $PWD to stderr by mistake * Fix lazy loading bash_completion from XDG_DATA_DIRS * feat(bin/git-browse): open website at file & line number or range * #970 standup added -A flag for author date * update git-utimes.{1,html} to add --newer flag * git-utimes: add --newer flag and don't touch files in the working tree and index * docs(instllation): replace git.io * Added config git-extras.standup-implicit-week for git standup * Document git standup -w option PR: 266953 Reported by: igor.ostapenko@pm.me (maintainer) --- devel/git-extras/Makefile | 2 +- devel/git-extras/distinfo | 6 +++--- devel/git-extras/files/patch-Makefile | 22 +++++++++++++++++++++- devel/git-extras/pkg-plist | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile index 043c1942d7ed..587e4ab9ef1e 100644 --- a/devel/git-extras/Makefile +++ b/devel/git-extras/Makefile @@ -1,5 +1,5 @@ PORTNAME= git-extras -PORTVERSION= 6.4.0 +PORTVERSION= 6.5.0 CATEGORIES= devel MAINTAINER= igor.ostapenko@pm.me diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo index c91b17b9fe83..3327105cd433 100644 --- a/devel/git-extras/distinfo +++ b/devel/git-extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651259571 -SHA256 (tj-git-extras-6.4.0_GH0.tar.gz) = d8943c0caab43e70c23890816a9775844d33261c40d5be03c1e012c276b1aa63 -SIZE (tj-git-extras-6.4.0_GH0.tar.gz) = 163508 +TIMESTAMP = 1665433128 +SHA256 (tj-git-extras-6.5.0_GH0.tar.gz) = eace7a0659749c72abf1cee68c03ea0a77715870d5e321c729e4a231ee359b61 +SIZE (tj-git-extras-6.5.0_GH0.tar.gz) = 167015 diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile index eb5c6f6801da..19a85d1d6616 100644 --- a/devel/git-extras/files/patch-Makefile +++ b/devel/git-extras/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2018-10-06 02:29:08 UTC +--- Makefile.orig 2022-10-06 12:33:44 UTC +++ Makefile @@ -3,7 +3,7 @@ BINPREFIX ?= "$(PREFIX)/bin" @@ -9,3 +9,23 @@ else MANPREFIX ?= "$(PREFIX)/share/man/man1" endif +@@ -69,8 +69,8 @@ install: check + cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \ + echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \ + fi +- @mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions +- cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras ++ @mkdir -p $(DESTDIR)$(PREFIX)/share/bash-completion/completions ++ cp -f etc/bash_completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/git-extras + @echo "" + @echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \ + "and put this line into ~/.zshrc to enable zsh completion" +@@ -119,7 +119,7 @@ uninstall: + echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \ + rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \ + ) +- rm -f $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras ++ rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/git-extras + + clean: docclean + diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist index 7932949b9153..33cf02a680e8 100644 --- a/devel/git-extras/pkg-plist +++ b/devel/git-extras/pkg-plist @@ -71,7 +71,6 @@ bin/git-touch bin/git-undo bin/git-unlock bin/git-utimes -etc/bash_completion.d/git-extras man/man1/git-abort.1.gz man/man1/git-alias.1.gz man/man1/git-archive-file.1.gz @@ -144,3 +143,4 @@ man/man1/git-touch.1.gz man/man1/git-undo.1.gz man/man1/git-unlock.1.gz man/man1/git-utimes.1.gz +share/bash-completion/completions/git-extras