diff options
author | adam <adam@pkgsrc.org> | 2012-10-06 18:28:12 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-10-06 18:28:12 +0000 |
commit | 19bf77960dc4def049e1144139c704debdcac1da (patch) | |
tree | 22ff007a1dbb11e2dfe318106cc0142331be49f3 /www | |
parent | 887e2861d71c8be25e6b2c08fa56efa0e2cbefc4 (diff) | |
download | pkgsrc-19bf77960dc4def049e1144139c704debdcac1da.tar.gz |
Fixes since v1.7.12.1
---------------------
* When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.
* Even during a conflicted merge, "git blame $path" always meant to
blame uncommitted changes to the "working tree" version; make it
more useful by showing cleanly merged parts as coming from the other
branch that is being merged.
* "git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.
* "git fetch --all", when passed "--no-tags", did not honor the
"--no-tags" option while fetching from individual remotes (the same
issue existed with "--tags", but combination "--all --tags" makes
much less sense than "--all --no-tags").
* "git log/diff/format-patch --stat" showed the "N line(s) added"
comment in user's locale and caused careless submitters to send
patches with such a line in them to projects whose project language
is not their language, mildly irritating others. Localization to
the line has been disabled for now.
* "git log --all-match --grep=A --grep=B" ought to show commits that
mention both A and B, but when these three options are used with
--author or --committer, it showed commits that mention either A or
B (or both) instead.
* The subcommand to remove the definition of a remote in "git remote"
was named "rm" even though all other subcommands were spelled out.
Introduce "git remote remove" to remove confusion, and keep "rm" as
a backward compatible synonym.
Also contains a handful of documentation updates.
Diffstat (limited to 'www')
-rw-r--r-- | www/gitweb/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/gitweb/Makefile b/www/gitweb/Makefile index 872d59de71d..d4462268a97 100644 --- a/www/gitweb/Makefile +++ b/www/gitweb/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2012/10/03 21:58:30 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2012/10/06 18:28:13 adam Exp $ .include "../../devel/scmgit/Makefile.version" DISTNAME= git-${GIT_VERSION} PKGNAME= ${DISTNAME:S/git/gitweb/} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -16,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir #DEPENDS+= apache{,2,22}-[0-9]*:../../www/apache22 DEPENDS+= scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base +DEPENDS+= p5-Time-HiRes>=1.9725:../../time/p5-Time-HiRes DISTINFO_FILE= ${.CURDIR}/../../devel/scmgit-base/distinfo |