Skip to content

Commit 2fc2b88

Browse files
committed
refactor: rename StartCommitMessage
1 parent fbdae90 commit 2fc2b88

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

configuration/configuration.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type Configuration struct {
2020
CliName string // override with MOB_CLI_NAME
2121
RemoteName string // override with MOB_REMOTE_NAME
2222
WipCommitMessage string // override with MOB_WIP_COMMIT_MESSAGE
23-
StartCISkipCommitMessage string // override with MOB_START_COMMIT_MESSAGE
23+
StartCommitMessage string // override with MOB_START_COMMIT_MESSAGE
2424
GitHooksEnabled bool // override with MOB_GIT_HOOKS_ENABLED
2525
RequireCommitMessage bool // override with MOB_REQUIRE_COMMIT_MESSAGE
2626
VoiceCommand string // override with MOB_VOICE_COMMAND
@@ -74,7 +74,7 @@ func Config(c Configuration) {
7474
say.Say("MOB_CLI_NAME" + "=" + quote(c.CliName))
7575
say.Say("MOB_REMOTE_NAME" + "=" + quote(c.RemoteName))
7676
say.Say("MOB_WIP_COMMIT_MESSAGE" + "=" + quote(c.WipCommitMessage))
77-
say.Say("MOB_START_COMMIT_MESSAGE" + "=" + quote(c.StartCISkipCommitMessage))
77+
say.Say("MOB_START_COMMIT_MESSAGE" + "=" + quote(c.StartCommitMessage))
7878
say.Say("MOB_GIT_HOOKS_ENABLED" + "=" + strconv.FormatBool(c.GitHooksEnabled))
7979
say.Say("MOB_REQUIRE_COMMIT_MESSAGE" + "=" + strconv.FormatBool(c.RequireCommitMessage))
8080
say.Say("MOB_VOICE_COMMAND" + "=" + quote(c.VoiceCommand))
@@ -174,7 +174,7 @@ func GetDefaultConfiguration() Configuration {
174174
CliName: "mob",
175175
RemoteName: "origin",
176176
WipCommitMessage: "mob next [ci-skip] [ci skip] [skip ci]",
177-
StartCISkipCommitMessage: "mob start [ci-skip] [ci skip] [skip ci]",
177+
StartCommitMessage: "mob start [ci-skip] [ci skip] [skip ci]",
178178
GitHooksEnabled: false,
179179
VoiceCommand: voiceCommand,
180180
VoiceMessage: "mob next",
@@ -230,7 +230,7 @@ func parseUserConfiguration(configuration Configuration, path string) Configurat
230230
case "MOB_WIP_COMMIT_MESSAGE":
231231
setUnquotedString(&configuration.WipCommitMessage, key, value)
232232
case "MOB_START_COMMIT_MESSAGE":
233-
setUnquotedString(&configuration.StartCISkipCommitMessage, key, value)
233+
setUnquotedString(&configuration.StartCommitMessage, key, value)
234234
case "MOB_GIT_HOOKS_ENABLED":
235235
setBoolean(&configuration.GitHooksEnabled, key, value)
236236
case "MOB_REQUIRE_COMMIT_MESSAGE":
@@ -321,7 +321,7 @@ func parseProjectConfiguration(configuration Configuration, path string) Configu
321321
case "MOB_WIP_COMMIT_MESSAGE":
322322
setUnquotedString(&configuration.WipCommitMessage, key, value)
323323
case "MOB_START_COMMIT_MESSAGE":
324-
setUnquotedString(&configuration.StartCISkipCommitMessage, key, value)
324+
setUnquotedString(&configuration.StartCommitMessage, key, value)
325325
case "MOB_GIT_HOOKS_ENABLED":
326326
setBoolean(&configuration.GitHooksEnabled, key, value)
327327
case "MOB_REQUIRE_COMMIT_MESSAGE":
@@ -417,7 +417,7 @@ func parseEnvironmentVariables(configuration Configuration) Configuration {
417417

418418
setStringFromEnvVariable(&configuration.RemoteName, "MOB_REMOTE_NAME")
419419
setStringFromEnvVariable(&configuration.WipCommitMessage, "MOB_WIP_COMMIT_MESSAGE")
420-
setStringFromEnvVariable(&configuration.StartCISkipCommitMessage, "MOB_START_COMMIT_MESSAGE")
420+
setStringFromEnvVariable(&configuration.StartCommitMessage, "MOB_START_COMMIT_MESSAGE")
421421
setBoolFromEnvVariable(&configuration.GitHooksEnabled, "MOB_GIT_HOOKS_ENABLED")
422422
setBoolFromEnvVariable(&configuration.RequireCommitMessage, "MOB_REQUIRE_COMMIT_MESSAGE")
423423
setOptionalStringFromEnvVariable(&configuration.VoiceCommand, "MOB_VOICE_COMMAND")

configuration/configuration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func TestReadConfigurationFromFileOverrideEverything(t *testing.T) {
201201
test.Equals(t, "team", actualConfiguration.CliName)
202202
test.Equals(t, "gitlab", actualConfiguration.RemoteName)
203203
test.Equals(t, "team next", actualConfiguration.WipCommitMessage)
204-
test.Equals(t, "mob: start", actualConfiguration.StartCISkipCommitMessage)
204+
test.Equals(t, "mob: start", actualConfiguration.StartCommitMessage)
205205
test.Equals(t, true, actualConfiguration.RequireCommitMessage)
206206
test.Equals(t, "whisper \"%s\"", actualConfiguration.VoiceCommand)
207207
test.Equals(t, "team next", actualConfiguration.VoiceMessage)

mob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ func startNewMobSession(configuration config.Configuration) {
969969

970970
say.Info("starting new session from " + currentBaseBranch.remote(configuration).String())
971971
git("checkout", "-B", currentWipBranch.Name, currentBaseBranch.remote(configuration).Name)
972-
git("commit", "--allow-empty", "-m", configuration.StartCISkipCommitMessage)
972+
git("commit", "--allow-empty", "-m", configuration.StartCommitMessage)
973973
gitPush(gitHooksOption(configuration), "--set-upstream", configuration.RemoteName, currentWipBranch.Name)
974974
}
975975

mob_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func TestStartWithCISkip(t *testing.T) {
226226

227227
assertOnBranch(t, "mob-session")
228228
assertMobSessionBranches(t, configuration, "mob-session")
229-
assertCommitLogContainsMessage(t, "mob-session", configuration.StartCISkipCommitMessage)
229+
assertCommitLogContainsMessage(t, "mob-session", configuration.StartCommitMessage)
230230
}
231231

232232
func TestStartWithMultipleExistingBranches(t *testing.T) {

squash_wip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func isWipCommit(line string, configuration config.Configuration) bool {
228228
}
229229

230230
func isStartCISkipCommit(line string, configuration config.Configuration) bool {
231-
return strings.Contains(line, configuration.StartCISkipCommitMessage)
231+
return strings.Contains(line, configuration.StartCommitMessage)
232232
}
233233

234234
func isPick(line string) bool {

squash_wip_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func TestSquashWipCommits_acceptanceWithDroppingStartCommit(t *testing.T) {
158158
"second manual commit",
159159
"first manual commit",
160160
configuration.WipCommitMessage,
161-
configuration.StartCISkipCommitMessage,
161+
configuration.StartCommitMessage,
162162
}, commitsOnCurrentBranch(configuration))
163163

164164
squashWip(configuration)
@@ -187,7 +187,7 @@ func TestCommitsOnCurrentBranch(t *testing.T) {
187187
equals(t, []string{
188188
configuration.WipCommitMessage,
189189
"on branch",
190-
configuration.StartCISkipCommitMessage,
190+
configuration.StartCommitMessage,
191191
}, commits)
192192
}
193193

@@ -314,13 +314,13 @@ pick c51a56d manual commit
314314
pick 01a9a32 %[1]s
315315
pick 01a9a33 %[1]s
316316
317-
# Rebase ...`, configuration.WipCommitMessage, configuration.StartCISkipCommitMessage)
317+
# Rebase ...`, configuration.WipCommitMessage, configuration.StartCommitMessage)
318318
expected := fmt.Sprintf(`drop 01a9a31 %[2]s
319319
pick c51a56d manual commit
320320
pick 01a9a32 %[1]s
321321
pick 01a9a33 %[1]s
322322
323-
# Rebase ...`, configuration.WipCommitMessage, configuration.StartCISkipCommitMessage)
323+
# Rebase ...`, configuration.WipCommitMessage, configuration.StartCommitMessage)
324324

325325
result := markStartCommitForDropping(input, configuration)
326326

0 commit comments

Comments
 (0)