Skip to content

Commit 2f52d6b

Browse files
committed
Removes the deprecated configuration property: MOB_START_INCLUDE_UNCOMMITTED_CHANGES
1 parent ee44f37 commit 2f52d6b

File tree

5 files changed

+3
-13
lines changed

5 files changed

+3
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- **NEW** Feature: `mob reset` doesn't reset the mob branch anymore. It now warns you that it deletes the mob branch for everyone and if you want to continue do `mob reset --delete-remote-wip-branch`.
33
- Feature: `mob start --create` will create the remote branch and start the mob session on that branch.
44
- Feature: mob.sh now also works with tools like `git-repo` which symlink the `.git` folder
5+
- Removed `MOB_START_INCLUDE_UNCOMMITTED_CHANGES` environment variable (has been deprecated for some time).
56

67
# 3.2.0
78
- Fix: `mob done --squash-wip` won't fail if a previously committed file has uncommitted modifications.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@ MOB_VOICE_MESSAGE="mob next"
367367
MOB_NOTIFY_COMMAND="/usr/bin/osascript -e 'display notification \"%s\"'"
368368
MOB_NOTIFY_MESSAGE="mob next"
369369
MOB_NEXT_STAY=true
370-
MOB_START_INCLUDE_UNCOMMITTED_CHANGES=false
371370
MOB_START_CREATE=false
372371
MOB_STASH_NAME="mob-stash-name"
373372
MOB_WIP_BRANCH_QUALIFIER=""

configuration/configuration.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type Configuration struct {
2727
NotifyCommand string // override with MOB_NOTIFY_COMMAND
2828
NotifyMessage string // override with MOB_NOTIFY_MESSAGE
2929
NextStay bool // override with MOB_NEXT_STAY
30-
StartIncludeUncommittedChanges bool // override with MOB_START_INCLUDE_UNCOMMITTED_CHANGES variable
30+
StartIncludeUncommittedChanges bool
3131
StartCreate bool // override with MOB_START_CREATE variable
3232
StashName string // override with MOB_STASH_NAME
3333
WipBranchQualifier string // override with MOB_WIP_BRANCH_QUALIFIER
@@ -80,7 +80,6 @@ func Config(c Configuration) {
8080
say.Say("MOB_NOTIFY_COMMAND" + "=" + quote(c.NotifyCommand))
8181
say.Say("MOB_NOTIFY_MESSAGE" + "=" + quote(c.NotifyMessage))
8282
say.Say("MOB_NEXT_STAY" + "=" + strconv.FormatBool(c.NextStay))
83-
say.Say("MOB_START_INCLUDE_UNCOMMITTED_CHANGES" + "=" + strconv.FormatBool(c.StartIncludeUncommittedChanges))
8483
say.Say("MOB_STASH_NAME" + "=" + quote(c.StashName))
8584
say.Say("MOB_WIP_BRANCH_QUALIFIER" + "=" + quote(c.WipBranchQualifier))
8685
say.Say("MOB_WIP_BRANCH_QUALIFIER_SEPARATOR" + "=" + quote(c.WipBranchQualifierSeparator))
@@ -241,8 +240,6 @@ func parseUserConfiguration(configuration Configuration, path string) Configurat
241240
setUnquotedString(&configuration.NotifyMessage, key, value)
242241
case "MOB_NEXT_STAY":
243242
setBoolean(&configuration.NextStay, key, value)
244-
case "MOB_START_INCLUDE_UNCOMMITTED_CHANGES":
245-
setBoolean(&configuration.StartIncludeUncommittedChanges, key, value)
246243
case "MOB_START_CREATE":
247244
setBoolean(&configuration.StartCreate, key, value)
248245
case "MOB_WIP_BRANCH_QUALIFIER":
@@ -324,8 +321,6 @@ func parseProjectConfiguration(configuration Configuration, path string) Configu
324321
setBoolean(&configuration.RequireCommitMessage, key, value)
325322
case "MOB_NEXT_STAY":
326323
setBoolean(&configuration.NextStay, key, value)
327-
case "MOB_START_INCLUDE_UNCOMMITTED_CHANGES":
328-
setBoolean(&configuration.StartIncludeUncommittedChanges, key, value)
329324
case "MOB_START_CREATE":
330325
setBoolean(&configuration.StartCreate, key, value)
331326
case "MOB_WIP_BRANCH_QUALIFIER":
@@ -411,7 +406,7 @@ func parseEnvironmentVariables(configuration Configuration) Configuration {
411406

412407
removed("MOB_BASE_BRANCH", "Use '"+configuration.Mob("start")+"' on your base branch instead.")
413408
removed("MOB_WIP_BRANCH", "Use '"+configuration.Mob("start --branch <branch>")+"' instead.")
414-
deprecated("MOB_START_INCLUDE_UNCOMMITTED_CHANGES", "Use the parameter --include-uncommitted-changes instead.")
409+
removed("MOB_START_INCLUDE_UNCOMMITTED_CHANGES", "Use the parameter --include-uncommitted-changes instead.")
415410
experimental("MOB_WIP_BRANCH_PREFIX")
416411

417412
setStringFromEnvVariable(&configuration.RemoteName, "MOB_REMOTE_NAME")
@@ -429,7 +424,6 @@ func parseEnvironmentVariables(configuration Configuration) Configuration {
429424

430425
setBoolFromEnvVariable(&configuration.NextStay, "MOB_NEXT_STAY")
431426

432-
setBoolFromEnvVariable(&configuration.StartIncludeUncommittedChanges, "MOB_START_INCLUDE_UNCOMMITTED_CHANGES")
433427
setBoolFromEnvVariable(&configuration.StartCreate, "MOB_START_CREATE")
434428

435429
setDoneSquashFromEnvVariable(&configuration, "MOB_DONE_SQUASH")

configuration/configuration_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func assertMobDoneSquashValue(t *testing.T, value string, expected string) {
100100
}
101101

102102
func TestBooleanEnvironmentVariables(t *testing.T) {
103-
assertBoolEnvVarParsed(t, "MOB_START_INCLUDE_UNCOMMITTED_CHANGES", false, Configuration.GetMobStartIncludeUncommittedChanges)
104103
assertBoolEnvVarParsed(t, "MOB_START_CREATE", false, Configuration.GetMobStartCreateRemoteBranch)
105104
assertBoolEnvVarParsed(t, "MOB_NEXT_STAY", true, Configuration.GetMobNextStay)
106105
assertBoolEnvVarParsed(t, "MOB_REQUIRE_COMMIT_MESSAGE", false, Configuration.GetRequireCommitMessage)
@@ -186,7 +185,6 @@ func TestReadConfigurationFromFileOverrideEverything(t *testing.T) {
186185
MOB_NOTIFY_COMMAND="/usr/bin/osascript -e 'display notification \"%s!!!\"'"
187186
MOB_NOTIFY_MESSAGE="team next"
188187
MOB_NEXT_STAY=false
189-
MOB_START_INCLUDE_UNCOMMITTED_CHANGES=true
190188
MOB_START_CREATE=true
191189
MOB_WIP_BRANCH_QUALIFIER="green"
192190
MOB_WIP_BRANCH_QUALIFIER_SEPARATOR="---"
@@ -211,7 +209,6 @@ func TestReadConfigurationFromFileOverrideEverything(t *testing.T) {
211209
test.Equals(t, "/usr/bin/osascript -e 'display notification \"%s!!!\"'", actualConfiguration.NotifyCommand)
212210
test.Equals(t, "team next", actualConfiguration.NotifyMessage)
213211
test.Equals(t, false, actualConfiguration.NextStay)
214-
test.Equals(t, true, actualConfiguration.StartIncludeUncommittedChanges)
215212
test.Equals(t, true, actualConfiguration.StartCreate)
216213
test.Equals(t, "green", actualConfiguration.WipBranchQualifier)
217214
test.Equals(t, "---", actualConfiguration.WipBranchQualifierSeparator)

mob-configuration-example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ MOB_REQUIRE_COMMIT_MESSAGE=false
55
MOB_VOICE_MESSAGE="mob next"
66
MOB_NOTIFY_MESSAGE="mob next"
77
MOB_NEXT_STAY=true
8-
MOB_START_INCLUDE_UNCOMMITTED_CHANGES=false
98
MOB_WIP_BRANCH_QUALIFIER=""
109
MOB_WIP_BRANCH_QUALIFIER_SEPARATOR="-"
1110
MOB_DONE_SQUASH=squash

0 commit comments

Comments
 (0)