[pkgsrc/trunk]: pkgsrc/devel git: updated to 2.18.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a1a99e7f60e
branches:  trunk
changeset: 309697:7a1a99e7f60e
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jun 22 08:57:17 2018 +0000

description:
git: updated to 2.18.0

2.18.0:

UI, Workflows & Features

 * Rename detection logic that is used in "merge" and "cherry-pick" has
   learned to guess when all of x/a, x/b and x/c have moved to z/a,
   z/b and z/c, it is likely that x/d added in the meantime would also
   want to move to z/d by taking the hint that the entire directory
   'x' moved to 'z'.  A bug causing dirty files involved in a rename
   to be overwritten during merge has also been fixed as part of this
   work.  Incidentally, this also avoids updating a file in the
   working tree after a (non-trivial) merge whose result matches what
   our side originally had.

 * "git filter-branch" learned to use a different exit code to allow
   the callers to tell the case where there was no new commits to
   rewrite from other error cases.

 * When built with more recent cURL, GIT_SSL_VERSION can now specify
   "tlsv1.3" as its value.

 * "git gui" learned that "~/.ssh/id_ecdsa.pub" and
   "~/.ssh/id_ed25519.pub" are also possible SSH key files.
   (merge 2e2f0288ef bb/git-gui-ssh-key-files later to maint).

 * "git gui" performs commit upon CTRL/CMD+ENTER but the
   CTRL/CMD+KP_ENTER (i.e. enter key on the numpad) did not have the
   same key binding.  It now does.
   (merge 28a1d94a06 bp/git-gui-bind-kp-enter later to maint).

 * "git gui" has been taught to work with old versions of tk (like
   8.5.7) that do not support "ttk::style theme use" as a way to query
   the current theme.
   (merge 4891961105 cb/git-gui-ttk-style later to maint).

 * "git rebase" has learned to honor "--signoff" option when using
   backends other than "am" (but not "--preserve-merges").

 * "git branch --list" during an interrupted "rebase -i" now lets
   users distinguish the case where a detached HEAD is being rebased
   and a normal branch is being rebased.

 * "git mergetools" learned talking to guiffy.

 * The scripts in contrib/emacs/ have outlived their usefulness and
   have been replaced with a stub that errors out and tells the user
   there are replacements.

 * The new "working-tree-encoding" attribute can ask Git to convert the
   contents to the specified encoding when checking out to the working
   tree (and the other way around when checking in).

 * The "git config" command uses separate options e.g. "--int",
   "--bool", etc. to specify what type the caller wants the value to
   be interpreted as.  A new "--type=<typename>" option has been
   introduced, which would make it cleaner to define new types.

 * "git config --get" learned the "--default" option, to help the
   calling script.  Building on top of the above changes, the
   "git config" learns "--type=color" type.  Taken together, you can
   do things like "git config --get foo.color --default blue" and get
   the ANSI color sequence for the color given to foo.color variable,
   or "blue" if the variable does not exist.

 * "git ls-remote" learned an option to allow sorting its output based
   on the refnames being shown.

 * The command line completion (in contrib/) has been taught that "git
   stash save" has been deprecated ("git stash push" is the preferred
   spelling in the new world) and does not offer it as a possible
   completion candidate when "git stash push" can be.

 * "git gc --prune=nonsense" spent long time repacking and then
   silently failed when underlying "git prune --expire=nonsense"
   failed to parse its command line.  This has been corrected.

 * Error messages from "git push" can be painted for more visibility.

 * "git http-fetch" (deprecated) had an optional and experimental
   "feature" to fetch only commits and/or trees, which nobody used.
   This has been removed.

 * The functionality of "$GIT_DIR/info/grafts" has been superseded by
   the "refs/replace/" mechanism for some time now, but the internal
   code had support for it in many places, which has been cleaned up
   in order to drop support of the "grafts" mechanism.

 * "git worktree add" learned to check out an existing branch.

 * "git --no-pager cmd" did not have short-and-sweet single letter
   option. Now it does as "-P".
   (merge 7213c28818 js/no-pager-shorthand later to maint).

 * "git rebase" learned "--rebase-merges" to transplant the whole
   topology of commit graph elsewhere.

 * "git status" learned to pay attention to UI related diff
   configuration variables such as diff.renames.

 * The command line completion mechanism (in contrib/) learned to load
   custom completion file for "git $command" where $command is a
   custom "git-$command" that the end user has on the $PATH when using
   newer version of bash-completion.

 * "git send-email" can sometimes offer confirmation dialog "Send this
   email?" with choices 'Yes', 'No', 'Quit', and 'All'.  A new action
   'Edit' has been added to this dialog's choice.

 * With merge.renames configuration set to false, the recursive merge
   strategy can be told not to spend cycles trying to find renamed
   paths and merge them accordingly.

 * "git status" learned to honor a new status.renames configuration to
   skip rename detection, which could be useful for those who want to
   do so without disabling the default rename detection done by the
   "git diff" command.

 * Command line completion (in contrib/) learned to complete pathnames
   for various commands better.

 * "git blame" learns to unhighlight uninteresting metadata from the
   originating commit on lines that are the same as the previous one,
   and also paint lines in different colors depending on the age of
   the commit.

 * Transfer protocol v2 learned to support the partial clone.

 * When a short hexadecimal string is used to name an object but there
   are multiple objects that share the string as the prefix of their
   names, the code lists these ambiguous candidates in a help message.
   These object names are now sorted according to their types for
   easier eyeballing.

 * "git fetch $there $refspec" that talks over protocol v2 can take
   advantage of server-side ref filtering; the code has been extended
   so that this mechanism triggers also when fetching with configured
   refspec.

 * Our HTTP client code used to advertise that we accept gzip encoding
   from the other side; instead, just let cURL library to advertise
   and negotiate the best one.

 * "git p4" learned to "unshelve" shelved commit from P4.
   (merge 123f631761 ld/p4-unshelve later to maint).

diffstat:

 devel/git-base/PLIST                  |   5 ++++-
 devel/git-base/distinfo               |  13 ++++++-------
 devel/git-base/patches/patch-Makefile |  22 +++++++++++-----------
 devel/git-base/patches/patch-ai       |  17 -----------------
 devel/git-docs/PLIST                  |   3 ++-
 devel/git/Makefile.version            |   4 ++--
 6 files changed, 25 insertions(+), 39 deletions(-)

diffs (184 lines):

diff -r c7b65435f642 -r 7a1a99e7f60e devel/git-base/PLIST
--- a/devel/git-base/PLIST      Fri Jun 22 08:26:53 2018 +0000
+++ b/devel/git-base/PLIST      Fri Jun 22 08:57:17 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2018/04/14 06:18:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2018/06/22 08:57:17 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -50,6 +50,7 @@
 libexec/git-core/git-clone
 libexec/git-core/git-column
 libexec/git-core/git-commit
+libexec/git-core/git-commit-graph
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
@@ -153,6 +154,7 @@
 libexec/git-core/git-rm
 libexec/git-core/git-send-email
 libexec/git-core/git-send-pack
+libexec/git-core/git-serve
 libexec/git-core/git-sh-i18n
 libexec/git-core/git-sh-i18n--envsubst
 libexec/git-core/git-sh-setup
@@ -196,6 +198,7 @@
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
 libexec/git-core/mergetools/examdiff
+libexec/git-core/mergetools/guiffy
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
diff -r c7b65435f642 -r 7a1a99e7f60e devel/git-base/distinfo
--- a/devel/git-base/distinfo   Fri Jun 22 08:26:53 2018 +0000
+++ b/devel/git-base/distinfo   Fri Jun 22 08:57:17 2018 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.81 2018/05/30 06:40:43 adam Exp $
+$NetBSD: distinfo,v 1.82 2018/06/22 08:57:17 adam Exp $
 
-SHA1 (git-2.17.1.tar.xz) = cdc8ba409643f6fe19b1bf0653d60f3aac0485f3
-RMD160 (git-2.17.1.tar.xz) = 8b0e973822ca721d9189ce13b7baf49677f98efb
-SHA512 (git-2.17.1.tar.xz) = 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960
-Size (git-2.17.1.tar.xz) = 5015484 bytes
-SHA1 (patch-Makefile) = c053b0ba6a84a2bb745a7ea60ed519c84cc3fb22
+SHA1 (git-2.18.0.tar.xz) = 5b259aecfd8e80dae1a03e74a68c77eff6d511c0
+RMD160 (git-2.18.0.tar.xz) = 2fc27cb7eaf9d74d0d305ef97fc1c6f7ea14a75f
+SHA512 (git-2.18.0.tar.xz) = db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+Size (git-2.18.0.tar.xz) = 5102264 bytes
+SHA1 (patch-Makefile) = 41955729837095abc055850751cce19023e7a2d1
 SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
-SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
diff -r c7b65435f642 -r 7a1a99e7f60e devel/git-base/patches/patch-Makefile
--- a/devel/git-base/patches/patch-Makefile     Fri Jun 22 08:26:53 2018 +0000
+++ b/devel/git-base/patches/patch-Makefile     Fri Jun 22 08:57:17 2018 +0000
@@ -1,22 +1,22 @@
-$NetBSD: patch-Makefile,v 1.2 2018/04/14 06:18:24 adam Exp $
+$NetBSD: patch-Makefile,v 1.3 2018/06/22 08:57:17 adam Exp $
 
 Do not override compiler/linker flags.
 Provide proper path for Perl module.
 Do not install git-p4 (requires Python).
 Fix tar operations.
 
---- Makefile.orig      2018-04-02 17:44:04.000000000 +0000
+--- Makefile.orig      2018-06-21 17:18:50.000000000 +0000
 +++ Makefile
-@@ -452,8 +452,6 @@ DEVELOPER_CFLAGS = -Werror \
-       -Wunused \
-       -Wvla
+@@ -493,8 +493,6 @@ GIT-VERSION-FILE: FORCE
+ 
+ CFLAGS = -g -O2 -Wall
  LDFLAGS =
 -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 -ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
  
  # Create as necessary, replace existing, make ranlib unneeded.
-@@ -482,7 +480,7 @@ gitexecdir = libexec/git-core
+@@ -524,7 +522,7 @@ gitexecdir = libexec/git-core
  mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
@@ -25,7 +25,7 @@
  localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
  htmldir = $(prefix)/share/doc/git-doc
-@@ -498,13 +496,9 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -544,13 +542,9 @@ perllibdir_relative = $(patsubst $(prefi
  
  export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
  
@@ -39,7 +39,7 @@
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
-@@ -624,7 +618,6 @@ clean-python-script:
+@@ -671,7 +665,6 @@ clean-python-script:
  
  SCRIPTS = $(SCRIPT_SH_INS) \
          $(SCRIPT_PERL_INS) \
@@ -47,7 +47,7 @@
          git-instaweb
  
  ETAGS_TARGET = TAGS
-@@ -1807,8 +1800,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+@@ -1913,8 +1906,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
  PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
  BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
  
@@ -58,7 +58,7 @@
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2588,13 +2581,12 @@ install: all
+@@ -2730,13 +2723,12 @@ install: all
  ifndef NO_GETTEXT
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
        (cd po/build/locale && $(TAR) cf - .) | \
@@ -74,7 +74,7 @@
  endif
  ifndef NO_TCLTK
        $(MAKE) -C gitk-git install
-@@ -2652,7 +2644,7 @@ install-man: install-man-perl
+@@ -2803,7 +2795,7 @@ install-man: install-man-perl
  install-man-perl: man-perl
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
        (cd perl/build/man/man3 && $(TAR) cf - .) | \
diff -r c7b65435f642 -r 7a1a99e7f60e devel/git-base/patches/patch-ai
--- a/devel/git-base/patches/patch-ai   Fri Jun 22 08:26:53 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2013/09/09 13:54:44 wiz Exp $
-
-Beginnings of emacs support, not enabled yet.  We must use mk/emacs.mk.
-
---- contrib/emacs/Makefile.orig        2008-08-17 16:43:06.000000000 -0400
-+++ contrib/emacs/Makefile
-@@ -12,8 +12,8 @@ RM ?= rm -f
- all: $(ELC)
- 
- install: all
--      $(INSTALL) -d $(DESTDIR)$(emacsdir)
--      $(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
-+      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(emacsdir)
-+      ${BSD_INSTALL_DATA} $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
- 
- %.elc: %.el
-       $(EMACS) -batch -f batch-byte-compile $<
diff -r c7b65435f642 -r 7a1a99e7f60e devel/git-docs/PLIST
--- a/devel/git-docs/PLIST      Fri Jun 22 08:26:53 2018 +0000
+++ b/devel/git-docs/PLIST      Fri Jun 22 08:57:17 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/04/11 19:39:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/06/22 08:57:17 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -22,6 +22,7 @@
 man/man1/git-clean.1
 man/man1/git-clone.1
 man/man1/git-column.1
+man/man1/git-commit-graph.1
 man/man1/git-commit-tree.1
 man/man1/git-commit.1
 man/man1/git-config.1
diff -r c7b65435f642 -r 7a1a99e7f60e devel/git/Makefile.version
--- a/devel/git/Makefile.version        Fri Jun 22 08:26:53 2018 +0000
+++ b/devel/git/Makefile.version        Fri Jun 22 08:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.71 2018/05/30 06:40:43 adam Exp $
+# $NetBSD: Makefile.version,v 1.72 2018/06/22 08:57:17 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.17.1
+GIT_VERSION=   2.18.0