1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
diff --git a/cmd/init.go b/cmd/init.go
index 4aae21e399e9781899b79c1c864eaf69c54fda5b..a1cf2816b98d1b9f6819fa36067f82a8c7a1b80d 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -9,6 +9,7 @@ "os"
"os/exec"
"path/filepath"
+ "github.com/bmatcuk/doublestar/v4"
"github.com/urfave/cli/v2"
)
@@ -53,45 +54,56 @@ if err != nil {
return err
}
- for file := range cfg {
- apn := filepath.Join(dir, file)
- args := []string{"smudge", "-f", file}
- if debug {
- args = append([]string{"-d"}, args...)
+ for glob := range cfg {
+ files, err := doublestar.FilepathGlob(glob, doublestar.WithFilesOnly())
+ if err != nil {
+ return fmt.Errorf("bad glob %q: %w", glob, err)
}
- if err := func() error {
- content, err := os.ReadFile(apn)
- if err != nil {
- return err
- }
-
- var buf bytes.Buffer
- c := exec.Command(exe, args...)
- c.Stdin = bytes.NewReader(content)
- c.Stdout = &buf
+ for _, file := range files {
+ apn := filepath.Join(dir, file)
+ args := []string{"smudge", "-f", file}
if debug {
- c.Stderr = os.Stderr
+ args = append([]string{"-d"}, args...)
}
- if err := c.Run(); err != nil {
+ if err := func() error {
+ content, err := os.ReadFile(apn)
+ if err != nil {
+ return err
+ }
+
+ var buf bytes.Buffer
+ c := exec.Command(exe, args...)
+ c.Stdin = bytes.NewReader(content)
+ c.Stdout = &buf
if debug {
- fmt.Fprintf(os.Stderr, "could not smudge file: %v\n", err)
+ c.Stderr = os.Stderr
}
- return nil
- }
+ if err := c.Run(); err != nil {
+ if debug {
+ fmt.Fprintf(os.Stderr, "could not smudge file: %v\n", err)
+ }
+ return nil
+ }
+
+ if buf.String() == "" {
+ // Blank content, exit
+ return nil
+ }
+
+ fi, err := os.Create(apn)
+ if err != nil {
+ return err
+ }
+ fi.Write(buf.Bytes())
+ if err := fi.Close(); err != nil {
+ return err
+ }
+ cmd("git", "add", "--renormalize", apn)
- fi, err := os.Create(apn)
- if err != nil {
- return err
- }
- fi.Write(buf.Bytes())
- if err := fi.Close(); err != nil {
+ return nil
+ }(); err != nil {
return err
}
- cmd("git", "add", "--renormalize", apn)
-
- return nil
- }(); err != nil {
- return err
}
}
|