Fix whichdo regressions

diff --git a/doc/news.texi b/doc/news.texi
index 68442f02066429dd70b216f6c18caa90ce57141f..ae1ca4a02a125c648c51fc827a018cef9b699c53 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -2,6 +2,13 @@
 @cindex news
 @unnumbered News
 
+@anchor{Release 2_3_0}
+@section Release 2.3.0
+@itemize
+@item
+    Fix regressions in @command{redo-whichdo} happened after huge refactoring.
+@end itemize
+
 @anchor{Release 2_2_0}
 @section Release 2.2.0
 @itemize

diff --git a/main.go b/main.go
index 03a73d448334295d8aa4e7a04f5a6b46c59f9a88..d6ac0d31147a1e73bc8de599a25ef14da2869fb9 100644 (file)
--- a/main.go
+++ b/main.go
@@ -394,7 +394,6 @@ func main() {
                if err != nil {
                        break
                }
-               sort.Strings(dos)
                for _, do := range dos {
                        fmt.Println(do)
                }

diff --git a/t/goredo-whichdo-regression.t b/t/goredo-whichdo-regression.t
new file mode 100755 (executable)
index 0000000..81a51a9
--- /dev/null
+++ b/t/goredo-whichdo-regression.t
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+testname=`basename "$0"`
+test_description="Check that dependencies have correct relative path after cd"
+. $SHARNESS_TEST_SRCDIR/sharness.sh
+export REDO_TOP_DIR="`pwd`" REDO_NO_PROGRESS=1
+
+cat > our <<EOF
+a/b/c.d.do
+a/b/default.d.do
+a/b/default.do
+a/default.d.do
+a/default.do
+default.d.do
+default.do
+EOF
+touch default.do
+redo-whichdo a/b/c.d > their
+test_expect_success expected "cmp --silent our their"
+
+test_done

diff --git a/usage.go b/usage.go
index 28036282fe0801c72ed89f5f69427666b43f99f2..a091a92f21972ed6b606036b8c2dc47e112af77b 100644 (file)
--- a/usage.go
+++ b/usage.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-       Version  = "2.2.0"
+       Version  = "2.3.0"
        Warranty = `Copyright (C) 2020-2023 Sergey Matveev
 
 This program is free software: you can redistribute it and/or modify

diff --git a/whichdo.go b/whichdo.go
index d74f2efc22dcd59b7aead6cc5067a2e140c4ed20..4a22b10c32ce28ec7d354779b0e67fb139e74f95 100644 (file)
--- a/whichdo.go
+++ b/whichdo.go
@@ -44,10 +44,10 @@ func whichdo(tgt *Tgt) (dos []string, err error) {
                        return
                }
                for _, ifcreate := range dep.ifcreates {
-                       dos = append(dos, ifcreate.RelTo(tgtH))
+                       dos = append(dos, ifcreate.RelTo(Cwd))
                }
                for _, ifchange := range dep.ifchanges {
-                       dos = append(dos, ifchange.tgt.RelTo(tgtH))
+                       dos = append(dos, ifchange.tgt.RelTo(Cwd))
                }
        }
        if doFile == "" {