Update to 0.18.2:

From the release announce mails:

   I've released cogito-0.18.2, bringing a couple of bugfixes and a trivial new
 feature to cogito-0.18.1. Still nothing too groundshattering.

 * cg-log does not follow history across renames anymore; it never really
   actually worked and was instead causing problems and random error
   messages. There needs to be git-core support for this funcionality,
   hacking it with a perl filter is bad design, so I'm not going to fix
   the filter (but I'd take patches if someone else did ;).

 * Fix cg-init not letting you edit the initial commit message by default
 * Fix cg-clone -l which would not setup alternates properly in some cases
 * Fix cg-merge not picking the right base when following volatile branches
 * Fix cg-log -d sometimes showing "% @" in diff output
 * Some other minor fixes

 * New cg-object-id -b to print the current branch name

 * Documentation improvements (better documented ignoring mechanism,
   ~/.gitconfig mentioned, GIT_COMMITTER_* bogus information fixed, ...)
 * Some testsuite fixes

---

    I've released cogito-0.18.1, bringing few minor new features and
  random bugfixes to the cogito-0.18 version. Nothing groundshattering.

  * cg-switch -c as a shortcut for cg-switch -r HEAD - use it to create a new
    branch with less typing
  * cg-patch -e to edit log message before autocommitting (useful esp. as
    cg-patch -m -e)
  * Support for cg-version --lib-dir, --share-dir
  * cg-admin-rewritehist now defines a map() function for filters' use,
    translating from old to new commit ids
  * cg-commit -e now runs editor on /dev/tty even if input is not a tty
  * Trivial documentation improvements
  * Random details fixed

4 files changed, 11 insertions, 45 deletions

diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index 0c4c9a2a97f..90996394301 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/12/03 22:15:48 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/03/10 19:09:33 wiz Exp $
 #
 
-DISTNAME=		cogito-0.18
-PKGREVISION=		2
+DISTNAME=		cogito-0.18.2
 CATEGORIES=		devel
 MASTER_SITES=		http://www.kernel.org/pub/software/scm/cogito/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/cogito/distinfo b/devel/cogito/distinfo
index 1a3eb92eee5..4f8fd3cc38c 100644
--- a/devel/cogito/distinfo
+++ b/devel/cogito/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/12/03 22:15:48 rillig Exp $
+$NetBSD: distinfo,v 1.6 2007/03/10 19:09:33 wiz Exp $
 
-SHA1 (cogito-0.18.tar.bz2) = 5d734f00107b35467378591cc24aaac83bcc4c02
-RMD160 (cogito-0.18.tar.bz2) = b9a60ad00f2d341ebf043a2a8edd3a457d6d0982
-Size (cogito-0.18.tar.bz2) = 107913 bytes
-SHA1 (patch-aa) = eb2740a0ac5ca0b5f7c1bce2747ef9ce0e792dc1
-SHA1 (patch-ab) = b64974caeb8202db6854a157f0fa2f9d587d95b7
+SHA1 (cogito-0.18.2.tar.bz2) = d4f4028d86206ebb80b86e48f90397e60a8c7c84
+RMD160 (cogito-0.18.2.tar.bz2) = f451696890676fbd912a5a00aa6715131a0ce6eb
+Size (cogito-0.18.2.tar.bz2) = 109203 bytes
+SHA1 (patch-ab) = 5ba8bf1ca856198f734578d381cedf0427be733c
 SHA1 (patch-ac) = 15c8a0392445bdd3eba5446e8743a17e6df4a475
 SHA1 (patch-ad) = 98e724e2ada26cf7fcaacc2ff964a452e3109a2d
diff --git a/devel/cogito/patches/patch-aa b/devel/cogito/patches/patch-aa
deleted file mode 100644
index a282eae8344..00000000000
--- a/devel/cogito/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/11/05 08:06:40 rillig Exp $
---- t/test-lib.sh~	2006-10-19 18:24:07.000000000 +0200
-+++ t/test-lib.sh	2006-10-19 18:26:02.000000000 +0200
-@@ -87,16 +87,16 @@
- 	say "FAIL $test_count: $1"
- 	shift
- 	echo "$@" | sed -e 's/^/	/'
--	test "$immediate" == "" || exit 1
-+	test "$immediate" = "" || exit 1
- }
- 
- 
- test_debug () {
--	test "$debug" == "" || eval "$1"
-+	test "$debug" = "" || eval "$1"
- }
- 
- test_expect_failure () {
--	test "$#" == 2 ||
-+	test "$#" = 2 ||
- 	error "bug in the test script: not 2 parameters to test-expect-failure"
- 	say >&3 "expecting failure: $2"
- 	if eval </dev/null >&3 2>&4 "$2"
-@@ -108,7 +108,7 @@
- }
- 
- test_expect_success () {
--	test "$#" == 2 ||
-+	test "$#" = 2 ||
- 	error "bug in the test script: not 2 parameters to test-expect-success"
- 	say >&3 "expecting success: $2"
- 	if eval </dev/null >&3 2>&4 "$2"
diff --git a/devel/cogito/patches/patch-ab b/devel/cogito/patches/patch-ab
index dc7c72fe970..68caea69c78 100644
--- a/devel/cogito/patches/patch-ab
+++ b/devel/cogito/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2006/11/09 02:19:59 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2007/03/10 19:09:33 wiz Exp $
 
 From PR 35020.
 
---- cg-Xlib~	2006-09-29 13:58:15.000000000 +0200
-+++ cg-Xlib	2006-11-08 20:56:27.000000000 +0100
-@@ -600,7 +600,7 @@
+--- cg-Xlib.orig	2006-11-17 00:37:24.000000000 +0000
++++ cg-Xlib
+@@ -615,7 +615,7 @@ tree_timewarp()
  		# Kill gone files
  		git-diff-tree -z --name-status -r "$base" "$branch" |
  			perl -n0e 'chomp; if (defined $meta) { print "$_\0" if $meta eq 'D'; $meta=undef } else { $meta = $_ }' |