CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 7 Sep 2016 08:56:33 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Sep  7 08:56:33 UTC 2016

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: PLIST distinfo
        pkgsrc/devel/git-base/patches: patch-aa

Log Message:
Changes 2.10.0:

UI, Workflows & Features

 * "git pull --rebase --verify-signature" learned to warn the user
   that "--verify-signature" is a no-op when rebasing.

 * An upstream project can make a recommendation to shallowly clone
   some submodules in the .gitmodules file it ships.

 * "git worktree add" learned that '-' can be used as a short-hand for
   "@{-1}", the previous branch.

 * Update the funcname definition to support css files.

 * The completion script (in contrib/) learned to complete "git
   status" options.

 * Messages that are generated by auto gc during "git push" on the
   receiving end are now passed back to the sending end in such a way
   that they are shown with "remote: " prefix to avoid confusing the
   users.

 * "git add -i/-p" learned to honor diff.compactionHeuristic
   experimental knob, so that the user can work on the same hunk split
   as "git diff" output.

 * "upload-pack" allows a custom "git pack-objects" replacement when
   responding to "fetch/clone" via the uploadpack.packObjectsHook.
   (merge b738396 jk/upload-pack-hook later to maint).

 * Teach format-patch and mailsplit (hence "am") how a line that
   happens to begin with "From " in the e-mail message is quoted with
   ">", so that these lines can be restored to their original shape.
   (merge d9925d1 ew/mboxrd-format-am later to maint).

 * "git repack" learned the "--keep-unreachable" option, which sends
   loose unreachable objects to a pack instead of leaving them loose.
   This helps heuristics based on the number of loose objects
   (e.g. "gc --auto").
   (merge e26a8c4 jk/repack-keep-unreachable later to maint).

 * "log --graph --format=" learned that "%>|(N)" specifies the width
   relative to the terminal's left edge, not relative to the area to
   draw text that is to the right of the ancestry-graph section.  It
   also now accepts negative N that means the column limit is relative
   to the right border.

 * A careless invocation of "git send-email directory/" after editing
   0001-change.patch with an editor often ends up sending both
   0001-change.patch and its backup file, 0001-change.patch~, causing
   embarrassment and a minor confusion.  Detect such an input and
   offer to skip the backup files when sending the patches out.
   (merge 531220b jc/send-email-skip-backup later to maint).

 * "git submodule update" that drives many "git clone" could
   eventually hit flaky servers/network conditions on one of the
   submodules; the command learned to retry the attempt.

 * The output coloring scheme learned two new attributes, italic and
   strike, in addition to existing bold, reverse, etc.

 * "git log" learns log.showSignature configuration variable, and a
   command line option "--no-show-signature" to countermand it.
   (merge fce04c3 mj/log-show-signature-conf later to maint).

 * More markings of messages for i18n, with updates to various tests
   to pass GETTEXT_POISON tests.

 * "git archive" learned to handle files that are larger than 8GB and
   commits far in the future than expressible by the traditional US-TAR
   format.
   (merge 560b0e8 jk/big-and-future-archive-tar later to maint).

 * A new configuration variable core.sshCommand has been added to
   specify what value for GIT_SSH_COMMAND to use per repository.

 * "git worktree prune" protected worktrees that are marked as
   "locked" by creating a file in a known location.  "git worktree"
   command learned a dedicated command pair to create and remove such
   a file, so that the users do not have to do this with editor.

 * A handful of "git svn" updates.

 * "git push" learned to accept and pass extra options to the
   receiving end so that hooks can read and react to them.

 * "git status" learned to suggest "merge --abort" during a conflicted
   merge, just like it already suggests "rebase --abort" during a
   conflicted rebase.

 * "git jump" script (in contrib/) has been updated a bit.
   (merge a91e692 jk/git-jump later to maint).

 * "git push" and "git clone" learned to give better progress meters
   to the end user who is waiting on the terminal.

 * An entry "git log --decorate" for the tip of the current branch is
   shown as "HEAD -> name" (where "name" is the name of the branch);
   the arrow is now painted in the same color as "HEAD", not in the
   color for commits.

 * "git format-patch" learned format.from configuration variable to
   specify the default settings for its "--from" option.

 * "git am -3" calls "git merge-recursive" when it needs to fall back
   to a three-way merge; this call has been turned into an internal
   subroutine call instead of spawning a separate subprocess.

 * The command line completion scripts (in contrib/) now knows about
   "git branch --delete/--move [--remote]".
   (merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint).

 * "git rev-parse --git-path hooks/<hook>" learned to take
   core.hooksPath configuration variable (introduced during 2.9 cycle)
   into account.
   (merge 9445b49 ab/hooks later to maint).

 * "git log --show-signature" and other commands that display the
   verification status of PGP signature now shows the longer key-id,
   as 32-bit key-id is so last century.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-base/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.47 pkgsrc/devel/git/Makefile.version:1.48
--- pkgsrc/devel/git/Makefile.version:1.47      Fri Aug 19 16:11:14 2016
+++ pkgsrc/devel/git/Makefile.version   Wed Sep  7 08:56:32 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.47 2016/08/19 16:11:14 wiz Exp $
+# $NetBSD: Makefile.version,v 1.48 2016/09/07 08:56:32 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.9.3
+GIT_VERSION=   2.10.0

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.13 pkgsrc/devel/git-base/PLIST:1.14
--- pkgsrc/devel/git-base/PLIST:1.13    Tue Jun 14 16:50:04 2016
+++ pkgsrc/devel/git-base/PLIST Wed Sep  7 08:56:33 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/06/14 16:50:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/09/07 08:56:33 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -203,6 +203,7 @@ share/examples/git/templates/hooks/pre-a
 share/examples/git/templates/hooks/pre-commit.sample
 share/examples/git/templates/hooks/pre-push.sample
 share/examples/git/templates/hooks/pre-rebase.sample
+share/examples/git/templates/hooks/pre-receive.sample
 share/examples/git/templates/hooks/prepare-commit-msg.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.53 pkgsrc/devel/git-base/distinfo:1.54
--- pkgsrc/devel/git-base/distinfo:1.53 Fri Aug 19 16:11:14 2016
+++ pkgsrc/devel/git-base/distinfo      Wed Sep  7 08:56:33 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.53 2016/08/19 16:11:14 wiz Exp $
+$NetBSD: distinfo,v 1.54 2016/09/07 08:56:33 adam Exp $
 
-SHA1 (git-2.9.3.tar.xz) = 5d0274c028083206844142263aeef110ec1495d5
-RMD160 (git-2.9.3.tar.xz) = 657d339c30d6319fcd8ff9938c5e2d20faec54ce
-SHA512 (git-2.9.3.tar.xz) = 7152d075b705c92c813e977558b1a6d8d1c9e6ac01b41ee052bcd40c056f08c6fdb030ef0995822c6d22ce44b739935d89026aeae35f8b93fb569773c4b005bb
-Size (git-2.9.3.tar.xz) = 4025288 bytes
-SHA1 (patch-aa) = b419c3771945696da0411a358c231f0357766bc0
+SHA1 (git-2.10.0.tar.xz) = a5c580e30b686e6b9424e886bf5d93ade635d837
+RMD160 (git-2.10.0.tar.xz) = d80fc2c17db82625e3c57362555de5d63cecb257
+SHA512 (git-2.10.0.tar.xz) = 69d031f55141c2cb2cfce69ac808d1765c1502e10867e8f6e8fb2d9ac5e2fa5773f3ba4a8f4b59e313c715e757c97b3cd3f1b13da45c7bc3958bf53026f0718e
+Size (git-2.10.0.tar.xz) = 4096264 bytes
+SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23

Index: pkgsrc/devel/git-base/patches/patch-aa
diff -u pkgsrc/devel/git-base/patches/patch-aa:1.7 pkgsrc/devel/git-base/patches/patch-aa:1.8
--- pkgsrc/devel/git-base/patches/patch-aa:1.7  Tue Jun 14 16:50:04 2016
+++ pkgsrc/devel/git-base/patches/patch-aa      Wed Sep  7 08:56:33 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2016/06/14 16:50:04 adam Exp $
+$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
 
---- Makefile.orig      2016-06-13 19:07:49.000000000 +0000
+--- Makefile.orig      2016-09-03 01:59:09.000000000 +0000
 +++ Makefile
-@@ -385,8 +385,6 @@ DEVELOPER_CFLAGS = -Werror \
+@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
        -Wunused \
        -Wvla
  LDFLAGS =
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2016/06/14 16:50
  STRIP ?= strip
  
  # Create as necessary, replace existing, make ranlib unneeded.
-@@ -430,13 +428,9 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -441,13 +439,9 @@ htmldir_relative = $(patsubst $(prefix)/
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
@@ -25,9 +25,9 @@ $NetBSD: patch-aa,v 1.7 2016/06/14 16:50
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
-@@ -1613,8 +1607,8 @@ ifdef DEFAULT_HELP_FORMAT
- BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
- endif
+@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+ BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
  
 -ALL_CFLAGS += $(BASIC_CFLAGS)
 -ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.7 2016/06/14 16:50
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -2309,11 +2303,10 @@ install: all
+@@ -2341,11 +2335,10 @@ install: all
  ifndef NO_GETTEXT
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
        (cd po/build/locale && $(TAR) cf - .) | \

Prev by Date: CVS commit: pkgsrc/www/curl
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www/curl
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index