Fri Nov 16 21:18:40 2012 UTC ()
Changes 1.8.0:
UI, Workflows & Features
* A credential helper for Win32 to allow access to the keychain of
the logged-in user has been added.
* An initial port to HP NonStop.
* A credential helper to allow access to the Gnome keyring has been
added.
* When "git am" sanitizes the "Subject:" line, we strip the prefix from
"Re: subject" and also from a less common "re: subject", but left
the even less common "RE: subject" intact. Now we strip that too.
* It was tempting to say "git branch --set-upstream origin/master",
but that tells Git to arrange the local branch "origin/master" to
integrate with the currently checked out branch, which is highly
unlikely what the user meant. The option is deprecated; use the
new "--set-upstream-to" (with a short-and-sweet "-u") option
instead.
* "git cherry-pick" learned the "--allow-empty-message" option to
allow it to replay a commit without any log message.
* After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" used to need to
be run with "-s" if the user wants to sign it off; now the command
leaves the sign-off line in the log template.
* "git daemon" learned the "--access-hook" option to allow an
external command to decline service based on the client address,
repository path, etc.
* "git difftool --dir-diff" learned to use symbolic links to prepare
a temporary copy of the working tree when available.
* "git grep" learned to use a non-standard pattern type by default if
a configuration variable tells it to.
* Accumulated updates to "git gui" has been merged.
* "git log -g" learned the "--grep-reflog=<pattern>" option to limit
its output to commits with a reflog message that matches the given
pattern.
* "git merge-base" learned the "--is-ancestor A B" option to tell if A is
an ancestor of B. The result is indicated by its exit status code.
* "git mergetool" now allows users to override the actual command used
with the mergetool.$name.cmd configuration variable even for built-in
mergetool backends.
* "git rebase -i" learned the "--edit-todo" option to open an editor
to edit the instruction sheet.
(adam)
diff -r1.48 -r1.49 pkgsrc/devel/scmgit/Makefile.version
diff -r1.37 -r1.38 pkgsrc/devel/scmgit-base/PLIST
diff -r1.62 -r1.63 pkgsrc/devel/scmgit-base/distinfo
diff -r1.18 -r1.19 pkgsrc/devel/scmgit-base/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/devel/scmgit-base/patches/patch-af
--- pkgsrc/devel/scmgit/Attic/Makefile.version 2012/10/06 18:28:12 1.48
+++ pkgsrc/devel/scmgit/Attic/Makefile.version 2012/11/16 21:18:37 1.49
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.48 2012/10/06 18:28:12 adam Exp $
+# $NetBSD: Makefile.version,v 1.49 2012/11/16 21:18:37 adam Exp $
#
# used by devel/scmgit/Makefile.common
# used by www/gitweb/Makefile
-GIT_VERSION= 1.7.12.2
+GIT_VERSION= 1.8.0
--- pkgsrc/devel/scmgit-base/Attic/PLIST 2012/10/28 01:17:09 1.37
+++ pkgsrc/devel/scmgit-base/Attic/PLIST 2012/11/16 21:18:38 1.38
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2012/10/28 01:17:09 christos Exp $
+@comment $NetBSD: PLIST,v 1.38 2012/11/16 21:18:38 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -186,6 +186,7 @@
libexec/git-core/git-write-tree
libexec/git-core/mergetools/araxis
libexec/git-core/mergetools/bc3
+libexec/git-core/mergetools/codecompare
libexec/git-core/mergetools/defaults
libexec/git-core/mergetools/deltawalker
libexec/git-core/mergetools/diffuse
--- pkgsrc/devel/scmgit-base/Attic/distinfo 2012/10/06 18:28:13 1.62
+++ pkgsrc/devel/scmgit-base/Attic/distinfo 2012/11/16 21:18:39 1.63
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.62 2012/10/06 18:28:13 adam Exp $
+$NetBSD: distinfo,v 1.63 2012/11/16 21:18:39 adam Exp $
-SHA1 (git-1.7.12.2.tar.gz) = 277b759139ddb62c6935da37de8a483e2c234a97
-RMD160 (git-1.7.12.2.tar.gz) = 8b50f2fe3c04e3bf7c3489e14f0cf2512eee251e
-Size (git-1.7.12.2.tar.gz) = 4106910 bytes
-SHA1 (patch-aa) = 5d94f08d4ee6146401e84f8ca1bde8eb1459731a
+SHA1 (git-1.8.0.tar.gz) = a03afc33f8f0723ad12649d79f1e8968526b4bf7
+RMD160 (git-1.8.0.tar.gz) = 84fc876984629b05042a0f4c418a340503862120
+Size (git-1.8.0.tar.gz) = 4225055 bytes
+SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
-SHA1 (patch-af) = 726b26f54b81973163d5941ad4a3392ea33a7ec2
+SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c
SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
--- pkgsrc/devel/scmgit-base/patches/Attic/patch-aa 2012/09/04 12:17:12 1.18
+++ pkgsrc/devel/scmgit-base/patches/Attic/patch-aa 2012/11/16 21:18:39 1.19
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $
+$NetBSD: patch-aa,v 1.19 2012/11/16 21:18:39 adam Exp $
---- Makefile.orig 2012-08-20 01:22:48.000000000 +0000
+--- Makefile.orig 2012-10-21 21:32:15.000000000 +0000
+++ Makefile
-@@ -325,8 +325,6 @@ endif
+@@ -343,8 +343,6 @@ endif
CFLAGS = -g -O2 -Wall
LDFLAGS =
@@ -11,7 +11,7 @@
STRIP ?= strip
# Among the variables below, these:
-@@ -361,13 +359,9 @@ pathsep = :
+@@ -379,13 +377,9 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir localedir
@@ -25,7 +25,7 @@
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
-@@ -1003,9 +997,10 @@ ifeq ($(uname_S),Darwin)
+@@ -1023,9 +1017,10 @@ ifeq ($(uname_S),Darwin)
BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
endif
ifeq ($(uname_S),SunOS)
@@ -37,7 +37,7 @@
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
-@@ -1048,8 +1043,6 @@ ifeq ($(uname_S),SunOS)
+@@ -1068,8 +1063,6 @@ ifeq ($(uname_S),SunOS)
NO_STRTOUMAX = YesPlease
GIT_TEST_CMP = cmp
endif
@@ -46,7 +46,7 @@
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
endif
ifeq ($(uname_O),Cygwin)
-@@ -1941,8 +1934,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
@@ -57,7 +57,7 @@
export DIFF TAR INSTALL DESTDIR SHELL_PATH
-@@ -2634,7 +2627,6 @@ ifndef NO_GETTEXT
+@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT
endif
ifndef NO_PERL
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
--- pkgsrc/devel/scmgit-base/patches/Attic/patch-af 2012/09/25 14:22:48 1.9
+++ pkgsrc/devel/scmgit-base/patches/Attic/patch-af 2012/11/16 21:18:39 1.10
@@ -1,11 +1,20 @@
-$NetBSD: patch-af,v 1.9 2012/09/25 14:22:48 taca Exp $
+$NetBSD: patch-af,v 1.10 2012/11/16 21:18:39 adam Exp $
* Use BSR_INSTALL_*.
* FIXME: Add "--skip-validation" to xmlto command.
---- Documentation/Makefile.orig 2012-08-20 01:22:48.000000000 +0000
+--- Documentation/Makefile.orig 2012-10-21 21:32:15.000000000 +0000
+++ Documentation/Makefile
-@@ -169,16 +169,16 @@ pdf: user-manual.pdf
+@@ -47,7 +47,7 @@ man7dir=$(mandir)/man7
+ ASCIIDOC = asciidoc
+ ASCIIDOC_EXTRA =
+ MANPAGE_XSL = manpage-normal.xsl
+-XMLTO = xmlto
++XMLTO = xmlto --skip-validation
+ XMLTO_EXTRA =
+ INSTALL?=install
+ RM ?= rm -f
+@@ -170,16 +170,16 @@ pdf: user-manual.pdf
install: install-man
install-man: man
@@ -30,12 +39,3 @@
if test -r $(DESTDIR)$(infodir)/dir; then \
$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
-@@ -245,7 +245,7 @@ manpage-base-url.xsl: manpage-base-url.x
-
- %.1 %.5 %.7 : %.xml manpage-base-url.xsl
- $(QUIET_XMLTO)$(RM) $@ && \
-- xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-+ xmlto --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-
- %.xml : %.txt
- $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \