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

cvs diff -r1.48 -r1.49 pkgsrc/devel/scmgit/Attic/Makefile.version (expand / switch to unified diff)

--- 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 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile.version,v 1.48 2012/10/06 18:28:12 adam Exp $ 1# $NetBSD: Makefile.version,v 1.49 2012/11/16 21:18:37 adam Exp $
2# 2#
3# used by devel/scmgit/Makefile.common 3# used by devel/scmgit/Makefile.common
4# used by www/gitweb/Makefile 4# used by www/gitweb/Makefile
5 5
6GIT_VERSION= 1.7.12.2 6GIT_VERSION= 1.8.0

cvs diff -r1.37 -r1.38 pkgsrc/devel/scmgit-base/Attic/PLIST (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.37 2012/10/28 01:17:09 christos Exp $ 1@comment $NetBSD: PLIST,v 1.38 2012/11/16 21:18:38 adam Exp $
2bin/git 2bin/git
3bin/git-cvsserver 3bin/git-cvsserver
4bin/git-receive-pack 4bin/git-receive-pack
5bin/git-shell 5bin/git-shell
6bin/git-upload-archive 6bin/git-upload-archive
7bin/git-upload-pack 7bin/git-upload-pack
8${PERL5_SUB_INSTALLVENDORLIB}/Git.pm 8${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
9lib/perl5/vendor_perl/${PKGMANDIR}/man3/Git.3 9lib/perl5/vendor_perl/${PKGMANDIR}/man3/Git.3
10${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py 10${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
11${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc 11${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc
12${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py 12${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py
13${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc 13${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc
14${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py 14${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py
@@ -176,26 +176,27 @@ libexec/git-core/git-unpack-objects @@ -176,26 +176,27 @@ libexec/git-core/git-unpack-objects
176libexec/git-core/git-update-index 176libexec/git-core/git-update-index
177libexec/git-core/git-update-ref 177libexec/git-core/git-update-ref
178libexec/git-core/git-update-server-info 178libexec/git-core/git-update-server-info
179libexec/git-core/git-upload-archive 179libexec/git-core/git-upload-archive
180libexec/git-core/git-upload-pack 180libexec/git-core/git-upload-pack
181libexec/git-core/git-var 181libexec/git-core/git-var
182libexec/git-core/git-verify-pack 182libexec/git-core/git-verify-pack
183libexec/git-core/git-verify-tag 183libexec/git-core/git-verify-tag
184libexec/git-core/git-web--browse 184libexec/git-core/git-web--browse
185libexec/git-core/git-whatchanged 185libexec/git-core/git-whatchanged
186libexec/git-core/git-write-tree 186libexec/git-core/git-write-tree
187libexec/git-core/mergetools/araxis 187libexec/git-core/mergetools/araxis
188libexec/git-core/mergetools/bc3 188libexec/git-core/mergetools/bc3
 189libexec/git-core/mergetools/codecompare
189libexec/git-core/mergetools/defaults 190libexec/git-core/mergetools/defaults
190libexec/git-core/mergetools/deltawalker 191libexec/git-core/mergetools/deltawalker
191libexec/git-core/mergetools/diffuse 192libexec/git-core/mergetools/diffuse
192libexec/git-core/mergetools/ecmerge 193libexec/git-core/mergetools/ecmerge
193libexec/git-core/mergetools/emerge 194libexec/git-core/mergetools/emerge
194libexec/git-core/mergetools/kdiff3 195libexec/git-core/mergetools/kdiff3
195libexec/git-core/mergetools/kompare 196libexec/git-core/mergetools/kompare
196libexec/git-core/mergetools/meld 197libexec/git-core/mergetools/meld
197libexec/git-core/mergetools/opendiff 198libexec/git-core/mergetools/opendiff
198libexec/git-core/mergetools/p4merge 199libexec/git-core/mergetools/p4merge
199libexec/git-core/mergetools/tkdiff 200libexec/git-core/mergetools/tkdiff
200libexec/git-core/mergetools/tortoisemerge 201libexec/git-core/mergetools/tortoisemerge
201libexec/git-core/mergetools/vim 202libexec/git-core/mergetools/vim

cvs diff -r1.62 -r1.63 pkgsrc/devel/scmgit-base/Attic/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.62 2012/10/06 18:28:13 adam Exp $ 1$NetBSD: distinfo,v 1.63 2012/11/16 21:18:39 adam Exp $
2 2
3SHA1 (git-1.7.12.2.tar.gz) = 277b759139ddb62c6935da37de8a483e2c234a97 3SHA1 (git-1.8.0.tar.gz) = a03afc33f8f0723ad12649d79f1e8968526b4bf7
4RMD160 (git-1.7.12.2.tar.gz) = 8b50f2fe3c04e3bf7c3489e14f0cf2512eee251e 4RMD160 (git-1.8.0.tar.gz) = 84fc876984629b05042a0f4c418a340503862120
5Size (git-1.7.12.2.tar.gz) = 4106910 bytes 5Size (git-1.8.0.tar.gz) = 4225055 bytes
6SHA1 (patch-aa) = 5d94f08d4ee6146401e84f8ca1bde8eb1459731a 6SHA1 (patch-aa) = b1a8a325a62013438324ec001bbe48eaebd56f5a
7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca 8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
9SHA1 (patch-af) = 726b26f54b81973163d5941ad4a3392ea33a7ec2 9SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c
10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e

cvs diff -r1.18 -r1.19 pkgsrc/devel/scmgit-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- 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,67 +1,67 @@ @@ -1,67 +1,67 @@
1$NetBSD: patch-aa,v 1.18 2012/09/04 12:17:12 adam Exp $ 1$NetBSD: patch-aa,v 1.19 2012/11/16 21:18:39 adam Exp $
2 2
3--- Makefile.orig 2012-08-20 01:22:48.000000000 +0000 3--- Makefile.orig 2012-10-21 21:32:15.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -325,8 +325,6 @@ endif 5@@ -343,8 +343,6 @@ endif
6  6
7 CFLAGS = -g -O2 -Wall 7 CFLAGS = -g -O2 -Wall
8 LDFLAGS = 8 LDFLAGS =
9-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) 9-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
10-ALL_LDFLAGS = $(LDFLAGS) 10-ALL_LDFLAGS = $(LDFLAGS)
11 STRIP ?= strip 11 STRIP ?= strip
12  12
13 # Among the variables below, these: 13 # Among the variables below, these:
14@@ -361,13 +359,9 @@ pathsep = : 14@@ -379,13 +377,9 @@ pathsep = :
15  15
16 export prefix bindir sharedir sysconfdir gitwebdir localedir 16 export prefix bindir sharedir sysconfdir gitwebdir localedir
17  17
18-CC = cc 18-CC = cc
19-AR = ar 19-AR = ar
20 RM = rm -f 20 RM = rm -f
21 DIFF = diff 21 DIFF = diff
22-TAR = tar 22-TAR = tar
23 FIND = find 23 FIND = find
24-INSTALL = install 24-INSTALL = install
25 RPMBUILD = rpmbuild 25 RPMBUILD = rpmbuild
26 TCL_PATH = tclsh 26 TCL_PATH = tclsh
27 TCLTK_PATH = wish 27 TCLTK_PATH = wish
28@@ -1003,9 +997,10 @@ ifeq ($(uname_S),Darwin) 28@@ -1023,9 +1017,10 @@ ifeq ($(uname_S),Darwin)
29 BASIC_CFLAGS += -DPRECOMPOSE_UNICODE 29 BASIC_CFLAGS += -DPRECOMPOSE_UNICODE
30 endif 30 endif
31 ifeq ($(uname_S),SunOS) 31 ifeq ($(uname_S),SunOS)
32+ NEED_LIBICONV = YesPlease 32+ NEED_LIBICONV = YesPlease
33 NEEDS_SOCKET = YesPlease 33 NEEDS_SOCKET = YesPlease
34 NEEDS_NSL = YesPlease 34 NEEDS_NSL = YesPlease
35- SHELL_PATH = /bin/bash 35- SHELL_PATH = /bin/bash
36+ SHELL_PATH = ${BASH} 36+ SHELL_PATH = ${BASH}
37 SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin 37 SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
38 NO_STRCASESTR = YesPlease 38 NO_STRCASESTR = YesPlease
39 NO_MEMMEM = YesPlease 39 NO_MEMMEM = YesPlease
40@@ -1048,8 +1043,6 @@ ifeq ($(uname_S),SunOS) 40@@ -1068,8 +1063,6 @@ ifeq ($(uname_S),SunOS)
41 NO_STRTOUMAX = YesPlease 41 NO_STRTOUMAX = YesPlease
42 GIT_TEST_CMP = cmp 42 GIT_TEST_CMP = cmp
43 endif 43 endif
44- INSTALL = /usr/ucb/install 44- INSTALL = /usr/ucb/install
45- TAR = gtar 45- TAR = gtar
46 BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H 46 BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
47 endif 47 endif
48 ifeq ($(uname_O),Cygwin) 48 ifeq ($(uname_O),Cygwin)
49@@ -1941,8 +1934,8 @@ ifdef DEFAULT_HELP_FORMAT 49@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
50 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' 50 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
51 endif 51 endif
52  52
53-ALL_CFLAGS += $(BASIC_CFLAGS) 53-ALL_CFLAGS += $(BASIC_CFLAGS)
54-ALL_LDFLAGS += $(BASIC_LDFLAGS) 54-ALL_LDFLAGS += $(BASIC_LDFLAGS)
55+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) 55+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
56+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS) 56+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
57  57
58 export DIFF TAR INSTALL DESTDIR SHELL_PATH 58 export DIFF TAR INSTALL DESTDIR SHELL_PATH
59  59
60@@ -2634,7 +2627,6 @@ ifndef NO_GETTEXT 60@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT
61 endif 61 endif
62 ifndef NO_PERL 62 ifndef NO_PERL
63 $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install 63 $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
64- $(MAKE) -C gitweb install 64- $(MAKE) -C gitweb install
65 endif 65 endif
66 ifndef NO_PYTHON 66 ifndef NO_PYTHON
67 $(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install 67 $(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install

cvs diff -r1.9 -r1.10 pkgsrc/devel/scmgit-base/patches/Attic/patch-af (expand / switch to unified diff)

--- 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,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-af,v 1.9 2012/09/25 14:22:48 taca Exp $ 1$NetBSD: patch-af,v 1.10 2012/11/16 21:18:39 adam Exp $
2 2
3* Use BSR_INSTALL_*. 3* Use BSR_INSTALL_*.
4* FIXME: Add "--skip-validation" to xmlto command. 4* FIXME: Add "--skip-validation" to xmlto command.
5 5
6--- Documentation/Makefile.orig 2012-08-20 01:22:48.000000000 +0000 6--- Documentation/Makefile.orig 2012-10-21 21:32:15.000000000 +0000
7+++ Documentation/Makefile 7+++ Documentation/Makefile
8@@ -169,16 +169,16 @@ pdf: user-manual.pdf 8@@ -47,7 +47,7 @@ man7dir=$(mandir)/man7
 9 ASCIIDOC = asciidoc
 10 ASCIIDOC_EXTRA =
 11 MANPAGE_XSL = manpage-normal.xsl
 12-XMLTO = xmlto
 13+XMLTO = xmlto --skip-validation
 14 XMLTO_EXTRA =
 15 INSTALL?=install
 16 RM ?= rm -f
 17@@ -170,16 +170,16 @@ pdf: user-manual.pdf
9 install: install-man 18 install: install-man
10  19
11 install-man: man 20 install-man: man
12- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) 21- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
13- $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) 22- $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
14- $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) 23- $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
15- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) 24- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
16- $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) 25- $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
17- $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) 26- $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
18+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) 27+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
19+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir) 28+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
20+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir) 29+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
21+ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir) 30+ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir)
22+ $(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir) 31+ $(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir)
23+ $(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir) 32+ $(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
24  33
25 install-info: info 34 install-info: info
26- $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) 35- $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
27- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) 36- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
28+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir) 37+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
29+ $(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir) 38+ $(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir)
30 if test -r $(DESTDIR)$(infodir)/dir; then \ 39 if test -r $(DESTDIR)$(infodir)/dir; then \
31 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ 40 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
32 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ 41 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
33@@ -245,7 +245,7 @@ manpage-base-url.xsl: manpage-base-url.x 
34  
35 %.1 %.5 %.7 : %.xml manpage-base-url.xsl 
36 $(QUIET_XMLTO)$(RM) $@ && \ 
37- xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< 
38+ xmlto --skip-validation -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< 
39  
40 %.xml : %.txt 
41 $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \