Skip to content

Commit 10945f6

Browse files
authored
Merge pull request #25 from rockstaedt/24-repair-validation
Fix hook script
2 parents d71a61a + 0cf65db commit 10945f6

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
What is the pull request about? What changes were made?
33

44
## Linked Issue
5-
Closes issue #_
5+
Closes #_

util/hook.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ func DeleteHook(path, _ string) error {
5151
}
5252

5353
func writeContent(writer io.Writer, exePath string) {
54-
_, err := fmt.Fprintf(writer, `#!/bin/sh\n\n"%s/commit-message-check" validate $1\n`, exePath)
54+
_, err := fmt.Fprint(writer, "#!/bin/sh\n\n")
55+
_, err = fmt.Fprintf(writer, `"%s/commit-message-check" validate $1`, exePath)
56+
_, err = fmt.Fprint(writer, "\n")
57+
5558
if err != nil {
5659
log.Printf("[ERROR]\t Could not write commit-msg script: %s", err)
5760
}

util/hook_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,23 @@ func TestWriteContent(t *testing.T) {
134134

135135
writeContent(buffer, "usr/tmp")
136136

137-
assert.Contains(t, buffer.String(), `#!/bin/sh\n\n`)
137+
assert.Contains(t, buffer.String(), "#!/bin/sh\n\n")
138138
})
139139

140140
t.Run("executes commit-message-check with root path and quotes path to handle spaces", func(t *testing.T) {
141141
buffer.Reset()
142142

143143
writeContent(buffer, "usr/tmp")
144144

145-
assert.Contains(t, buffer.String(), `"usr/tmp/commit-message-check" validate $1\n`)
145+
assert.Contains(t, buffer.String(), `"usr/tmp/commit-message-check" validate $1`)
146+
})
147+
148+
t.Run("inserts a blank line at the end of file", func(t *testing.T) {
149+
buffer.Reset()
150+
151+
writeContent(buffer, "usr/tmp")
152+
153+
assert.Contains(t, buffer.String(), "$1\n")
146154
})
147155

148156
t.Run("logs any error", func(t *testing.T) {

0 commit comments

Comments
 (0)