[Bug-vc-dwim] fyi: two patches

[Jim Meyering]

>From 3dd27e989e1d62110d2e8083accc6ac044e5dacf Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 16 Mar 2009 11:28:55 +0100
Subject: [PATCH 1/2] * configure.ac: Use dist-xz, not dist-lzma.

---
 ChangeLog    |    4 ++++
 configure.ac |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f0507a..3c7dcd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-16  Jim Meyering  <address@hidden>
+
+       * configure.ac: Use dist-xz, not dist-lzma.
+
 2008-08-21  Ralf Wildenhues  <address@hidden>

        * vc-chlog.in (func_extract_changed_lines): Accept
diff --git a/configure.ac b/configure.ac
index 2f27aa0..e9dcc57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 Free Software Foundation, Inc.
 # This file may be modified and/or distributed without restriction.

 # Make inter-release version strings look like, e.g., v1.0-219-g58ddd, which
@@ -9,7 +9,7 @@ AC_INIT([vc-dwim],
        address@hidden)

 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.10.1 dist-lzma])
+AM_INIT_AUTOMAKE([1.10.1 dist-xz])

 # Minimum Autoconf version required.
 AC_PREREQ(2.59)
--
1.6.2.rc1.285.gc5f54


>From fdfe86490e26c7d74ada2d4cfd961ca760ab8886 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 16 Mar 2009 11:32:34 +0100
Subject: [PATCH 2/2] accept new git diff output: diff --git c/... w/...

* vc-dwim.pl (cross_check): a/ and b/ prefix strings may be c/ and w/,
so accept any one-letter prefix.
Also, record each such name as "seen".
---
 ChangeLog  |    5 +++++
 vc-dwim.pl |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c7dcd3..b050362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-16  Jim Meyering  <address@hidden>

+       accept new git diff output: diff --git c/... w/...
+       * vc-dwim.pl (cross_check): a/ and b/ prefix strings may be c/ and w/,
+       so accept any one-letter prefix.
+       Also, record each such name as "seen".
+
        * configure.ac: Use dist-xz, not dist-lzma.

 2008-08-21  Ralf Wildenhues  <address@hidden>
diff --git a/vc-dwim.pl b/vc-dwim.pl
index c13e807..7e6e3f7 100755
--- a/vc-dwim.pl
+++ b/vc-dwim.pl
@@ -2,7 +2,7 @@
 # vc-dwim - a version-control-agnostic ChangeLog diff and commit tool
 # @configure_input@
 #
-# Copyright 2006-2008 Free Software Foundation, Inc.
+# Copyright 2006-2009 Free Software Foundation, Inc.
 # Written by Jim Meyering <address@hidden>

 # This program is free software: you can redistribute it and/or modify
@@ -629,9 +629,10 @@ sub cross_check ($$$)
           $diff_line =~ /^diff /
             and undef $prev_file;

-          if ($diff_line =~ m!^diff --git a/(\S+) b/\S+$!)
+          if ($diff_line =~ m!^diff --git ./(\S+) ./\S+$!)
             {
               $prev_file = $1;
+              $seen{$prev_file} = 1;
               next;
             }

--
1.6.2.rc1.285.gc5f54