#
#
# patch "tests/(imp)_deleting_directories/__driver__.lua"
#  from [d93d73aa7d1f9804e763eaba12d540b84806e47a]
#    to [d61c53d1bd6a7f33d61d317db6c561d0330804ea]
# 
# patch "tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua"
#  from [ced4ffc5130603ac1b82c144554a67f73308dbec]
#    to [e85450cf22ef5a4b416810367f31fe8b24dbf11f]
# 
# patch "tests/_--author,_--date/__driver__.lua"
#  from [32996584305ed55d69e88dd14f0570e6da40b827]
#    to [de314b4eb8f661d39bd2720efa349d39bb90c459]
# 
# patch "tests/_--rcfile=-/__driver__.lua"
#  from [8aa2ee729280a9a70d795e4bb4d6b3a96bae7011]
#    to [0ee77183b829f47bff08b40868491f2f60598d5e]
# 
# patch "tests/automate_cert/__driver__.lua"
#  from [21c1631cb67da926ed7fdc1995db5dae2130bb05]
#    to [a0191f84d101ee43c0b99c910701ce74b3c724bd]
# 
# patch "tests/automate_certs/__driver__.lua"
#  from [02cf8d138501cf6d2db13829b120bc7facbbf3b3]
#    to [3f7d20eee34e4c3c6442a3be6451b1e5f29989a1]
# 
# patch "tests/automate_get_content_changed/__driver__.lua"
#  from [c5f370f8e1bb223a807e5f214397f68ae4545d56]
#    to [093f3729382b1ad12951d51f1a9bde66e10cfe4d]
# 
# patch "tests/automate_get_corresponding_path/__driver__.lua"
#  from [a40c3a12d101610834ebd79bb9f251ba8599e928]
#    to [e9c6d5de7c2b70528a1977cba082e29225845f45]
# 
# patch "tests/automate_get_file,_automate_get_file_of/__driver__.lua"
#  from [1488e443fdf351aad88fc3c2fbdb93a0c1dd3f3f]
#    to [63db7b8fbed58ecf777ad8c9b3535f7b5cf39bfd]
# 
# patch "tests/automate_get_manifest_of/__driver__.lua"
#  from [637b289e52f24a68d5af91f4394dbf8f2d0ec301]
#    to [738ee41d2cd7dc2ccd34aaf71d22d3c474e3859b]
# 
# patch "tests/automate_get_revision/__driver__.lua"
#  from [86d844d42180fe5d15d92feb3ead32d41438cec3]
#    to [7f33cdf44581199ffc5943d2c565a494d2d77085]
# 
# patch "tests/b_t_and_a_selector_globbing/__driver__.lua"
#  from [39d20812db86092429f4c37edd7ff23734a1a2b1]
#    to [6863c3e5f38499319f4efbd077e23f22e85b345c]
# 
# patch "tests/can_execute_things/__driver__.lua"
#  from [b679678b80b65e6c6ae604e8d00fba852d4ad071]
#    to [07e9c4953c928a60f9255d9a4dac64e28dc8ae7d]
# 
# patch "tests/check_--log/__driver__.lua"
#  from [ab40c2b60c45d6ad8b93b59f047d144993fbd143]
#    to [4f92e4011c85b609551d007b2e4de137acf37df3]
# 
# patch "tests/check_later_and_earlier_selectors/__driver__.lua"
#  from [f3ab1f5511f5367c72993bbff9d19d7b002b3835]
#    to [e31b4b771ee568dd6bdd3b3fd789c3b091e660d2]
# 
# patch "tests/checkout_creates__MTN_log/__driver__.lua"
#  from [0cb0297db597db9d617a852e9fc5b8d04481172b]
#    to [43f2026e4979f71e2b0324865a2b2c80cd924062]
# 
# patch "tests/clone_creates__MTN_log/__driver__.lua"
#  from [da936653810379282e5456c38552448f100186eb]
#    to [3abf35888b99a48508900ee3c6f8c86705877c40]
# 
# patch "tests/commit_update_multiple_heads_message/__driver__.lua"
#  from [c4b15a47da1bda099901e5091836754154fdba3b]
#    to [4e65aeed2463edd034af42ca2669cfaee009351c]
# 
# patch "tests/commit_using__MTN_log/__driver__.lua"
#  from [a9b708bd811300cc5c4ca78b932f50f7f93341cf]
#    to [d6d1a5d20d1e38805bb9b0e36ca0b6e4debe30b4]
# 
# patch "tests/commit_validation_lua_hook/__driver__.lua"
#  from [9e779e1a652d35a354e0d1887f7a493d308398b1]
#    to [56ef1c2919ad5da86c9387930a01fb4642375577]
# 
# patch "tests/commit_with_--message-file/__driver__.lua"
#  from [c489098cf8e352319705e1965af1632d06f68316]
#    to [50544af1db255b049a1ab3d511d7c046abc80c90]
# 
# patch "tests/commit_writes_message_back_to__MTN_log/__driver__.lua"
#  from [7758bd1d4316f2c3e80cc4018a4b3ab4067137b7]
#    to [5fe66003c9fb4ad9092b473a1d9513bec2c093a8]
# 
# patch "tests/database_is_closed_on_signal_exit/__driver__.lua"
#  from [84fd9f4bec67e21eb3e98ebd38082956a3578e46]
#    to [09a930716f35e9c043cd457bbac32ee7b073581c]
# 
# patch "tests/disallowing_persistence_of_passphrase/__driver__.lua"
#  from [f958eef23ce1d9afe61383d47a3bca777e206a8a]
#    to [a531d0441c19c9b4c83f9e78eca496af477594ba]
# 
# patch "tests/do_not_log_the_result_of_hook_get_passphrase/__driver__.lua"
#  from [d8eaa394152f4da3e96fddff4b9c1c8f13a5a927]
#    to [1faf2b751278037ff732f366e471c9049052c68c]
# 
# patch "tests/empty_environment/__driver__.lua"
#  from [4e70feabad49fb196e7637136cd66b5a4f54b59d]
#    to [63329ebcd24fc882f03f517fc4e75a709fbff8eb]
# 
# patch "tests/listing_workspace_manifests/__driver__.lua"
#  from [2a0a4649b1e147bfe14eb15666ce1ff47aa77a23]
#    to [95c44a3cc396af1974e3a9cf2989ab224f70369f]
# 
# patch "tests/log_--brief/__driver__.lua"
#  from [5fe08b4182a0dd9349743363da14eb0c4582fcea]
#    to [36d69ea2af91ecf4247411ed423c52203ff8d84c]
# 
# patch "tests/log_and_selectors_returning_multiple_rids/__driver__.lua"
#  from [ecdd5f0daf85648b2f9a2eefc5ac537a62676124]
#    to [35300f5beb9e735b9ff8ae26d5527a729b9d8e7e]
# 
# patch "tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua"
#  from [4ec9d25eab337911fbab21281d28c945482a0ce6]
#    to [0f1952ca7f9012ac4e064e1c37713d6443c55770]
# 
# patch "tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua"
#  from [cc83b2b114c4065c65f166c731e7b9090892bf83]
#    to [1f12047a1361126ee9641f08caf0bd2511d13d9f]
# 
# patch "tests/netsync_transfers_public_keys/__driver__.lua"
#  from [7c33043f7bea601ceb114aa57853ca0ecdbbdcca]
#    to [9402ab027c9214de88a45ded202ca6089093cc80]
# 
# patch "tests/normalized_filenames/__driver__.lua"
#  from [2948e8e6933cdf7851d6892df016aec48bf54525]
#    to [5915d21d8d34634dde51930c7771bedf1382f8e8]
# 
# patch "tests/persistence_of_passphrase/__driver__.lua"
#  from [e5a6a36c72e537682cb5f37211d2508d42060a9c]
#    to [9cbc51fc2644a7208ba28e6770ae927c40b5466c]
# 
# patch "tests/persistent_netsync_server_-_keys/__driver__.lua"
#  from [d9a6a5c55dc85ad55f06cb316dc4231ada807e93]
#    to [4eba9609a7681bcb0acaf57e51906b14de57715a]
# 
# patch "tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua"
#  from [ae88e5fbf13f1c3b47befa86b9e0397e9b835f20]
#    to [d5c2a4ab7e1b2cb6ed804ea5a49e70ac39aba390]
# 
# patch "tests/read_and_convert_old_privkey_packet/__driver__.lua"
#  from [4da19713ba2c6c334cc39d6f186e3bbe23d0506f]
#    to [d4a1b4e085b5a7b4f10b9f9f09ef88483a3bf095]
# 
# patch "tests/renaming_and_editing_a_file/__driver__.lua"
#  from [0a642d8215a047f22a1baf695ec0ecf437092c09]
#    to [1badcd10e583f836a8f29da2190e32a8d090c102]
# 
# patch "tests/schema_migration/__driver__.lua"
#  from [d708709c691b1536d54702969a8ffbffd5fa3c5f]
#    to [ce9c3d914349381454c18b6218442797ffefa8f3]
# 
# patch "tests/schema_migration_with_rosterify/__driver__.lua"
#  from [5b2bd19e135432bf53511d7fd1f422b5177544c4]
#    to [ea7110d3182fb9f7dabe4a150fd4962cb1c9f77d]
# 
# patch "tests/short_options_work_correctly/__driver__.lua"
#  from [2ff2788145feea06d2e1336846ca22cdcc3fa37c]
#    to [3a102e5e93430d2cf82d7bc513c9d014d32139ad]
# 
# patch "tests/sticky_branches/__driver__.lua"
#  from [ed9188c29ff7be00e5ea2b7cde67b17432f8adda]
#    to [3537b6777ba7cf8fde74a3faa23d149cefe8556a]
# 
# patch "tests/update_does_not_stomp_non-monotone_files/__driver__.lua"
#  from [72480446e72630b71f4fea0d2fc58d043e2cab9a]
#    to [a61a18dce188bd18d8ad03ac3a195d1b669e624c]
# 
# patch "testsuite.lua"
#  from [30b370324e7794c693af1e36ee7360e348a3a868]
#    to [febf08a23201941561bf7c6f29269d85c6516e1a]
#
============================================================
--- tests/(imp)_deleting_directories/__driver__.lua	d93d73aa7d1f9804e763eaba12d540b84806e47a
+++ tests/(imp)_deleting_directories/__driver__.lua	d61c53d1bd6a7f33d61d317db6c561d0330804ea
@@ -1,4 +1,4 @@
-
+ 
 mtn_setup()
 
 revs = {}
============================================================
--- tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua	ced4ffc5130603ac1b82c144554a67f73308dbec
+++ tests/(imp)_persistent_netsync_server_-_keys_2/__driver__.lua	e85450cf22ef5a4b416810367f31fe8b24dbf11f
@@ -21,7 +21,7 @@ check(mtn2("status"), 0, false, false)
 
 addfile("foo", "data data blah")
 check(mtn2("status"), 0, false, false)
-check(mtn2("commit", "address@hidden", "--branch=testbranch", "-m", 'commit foo'), 0, false, false)
+check(mtn2("commit", "address@hidden", "-m", 'commit foo'), 0, false, false)
 
 srv = netsync.start()
 srv:push("testbranch", 2)
============================================================
--- tests/_--author,_--date/__driver__.lua	32996584305ed55d69e88dd14f0570e6da40b827
+++ tests/_--author,_--date/__driver__.lua	de314b4eb8f661d39bd2720efa349d39bb90c459
@@ -1,8 +1,9 @@ addfile("testfile", "floooooo")
 
 mtn_setup()
 
 addfile("testfile", "floooooo")
-check(mtn("commit", "--author=the_author", "--date=1999-12-31T12:00:00", "--branch=foo", "--message=foo"), 0, false, false)
+check(mtn("branch", "foo"), 0, false, false)
+check(mtn("commit", "--author=the_author", "--date=1999-12-31T12:00:00", "--message=foo"), 0, false, false)
 rev = base_revision()
 check(mtn("log", "--from", rev), 0, true, false)
 
@@ -10,4 +11,4 @@ writefile("testfile", "oovel")
 check(qgrep('^[\\| ]+Date: 1999-12-31T12:00:00', "stdout"))
 
 writefile("testfile", "oovel")
+check(mtn("commit", "--date=1999-12-31T12:00foo", "--message=foo"), 1, false, false)
-check(mtn("commit", "--date=1999-12-31T12:00foo", "--branch=foo", "--message=foo"), 1, false, false)
============================================================
--- tests/_--rcfile=-/__driver__.lua	8aa2ee729280a9a70d795e4bb4d6b3a96bae7011
+++ tests/_--rcfile=-/__driver__.lua	0ee77183b829f47bff08b40868491f2f60598d5e
@@ -1,9 +1,9 @@ addfile("testfile", "blah blah")
 
 mtn_setup()
 
 check(get("foo.rc"))
 
 addfile("testfile", "blah blah")
-check(mtn("--rcfile=-", "commit", "--message=foo", "--branch=testbranch"), 0, true, false, {"foo.rc"})
+check(mtn("--rcfile=-", "commit", "--message=foo"), 0, true, false, {"foo.rc"})
 
 check(qgrep("BOOGA", "stdout"))
============================================================
--- tests/automate_cert/__driver__.lua	21c1631cb67da926ed7fdc1995db5dae2130bb05
+++ tests/automate_cert/__driver__.lua	a0191f84d101ee43c0b99c910701ce74b3c724bd
@@ -6,7 +6,7 @@ addfile("foo", "blah")
 writefile("empty", "")
 
 addfile("foo", "blah")
-check(mtn("commit", "--date=2005-05-21T12:30:51", "--branch=testbranch",
+check(mtn("commit", "--date=2005-05-21T12:30:51",
           "--message=blah-blah"), 0, false, false)
 base = base_revision()
 
============================================================
--- tests/automate_certs/__driver__.lua	02cf8d138501cf6d2db13829b120bc7facbbf3b3
+++ tests/automate_certs/__driver__.lua	3f7d20eee34e4c3c6442a3be6451b1e5f29989a1
@@ -7,7 +7,7 @@ addfile("foo", "blah")
 writefile("empty", "")
 
 addfile("foo", "blah")
-check(mtn("commit", "--date=2005-05-21T12:30:51", "--branch=testbranch",
+check(mtn("commit", "--date=2005-05-21T12:30:51",
           "--message=blah-blah"), 0, false, false)
 base = base_revision()
 
============================================================
--- tests/automate_get_content_changed/__driver__.lua	c5f370f8e1bb223a807e5f214397f68ae4545d56
+++ tests/automate_get_content_changed/__driver__.lua	093f3729382b1ad12951d51f1a9bde66e10cfe4d
@@ -6,7 +6,7 @@ check(mtn("commit", "--date=2005-05-21T1
 -- trivial case; a single file, with no history (it should be marked itself)
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 rev = base_revision()
 
 -- check that a correct usage produces correctly formatted output
============================================================
--- tests/automate_get_corresponding_path/__driver__.lua	a40c3a12d101610834ebd79bb9f251ba8599e928
+++ tests/automate_get_corresponding_path/__driver__.lua	e9c6d5de7c2b70528a1977cba082e29225845f45
@@ -7,12 +7,12 @@ check(mtn("commit", "--date=2005-05-21T1
 -- add a file, commit, rename, commit, find the old name
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 old_rev = base_revision()
 check(mtn("rename", "--bookkeep-only", "foo", "foo2"), 0, true, false)
 rename("foo", "foo2")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 rev = base_revision()
 
 -- file foo has been renamed to foo2, in the new revision we should be able to find the old name
@@ -23,7 +23,7 @@ check(mtn("commit", "--date=2005-05-21T1
 -- check that it works for files that don't exist in the previous revision
 addfile("foo3", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 rev = base_revision()
 check(mtn("automate", "get_corresponding_path", rev, "foo3", old_rev), 0, true, false)
 canonicalize("stdout")
============================================================
--- tests/automate_get_file,_automate_get_file_of/__driver__.lua	1488e443fdf351aad88fc3c2fbdb93a0c1dd3f3f
+++ tests/automate_get_file,_automate_get_file_of/__driver__.lua	63db7b8fbed58ecf777ad8c9b3535f7b5cf39bfd
@@ -5,9 +5,8 @@ addfile("foo", "blah\n")
 
 writefile("expected", "blah\n")
 addfile("foo", "blah\n")
-
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 rev1 = base_revision()
 
 --
============================================================
--- tests/automate_get_manifest_of/__driver__.lua	637b289e52f24a68d5af91f4394dbf8f2d0ec301
+++ tests/automate_get_manifest_of/__driver__.lua	738ee41d2cd7dc2ccd34aaf71d22d3c474e3859b
@@ -6,7 +6,7 @@ check(mtn("commit", "--date=2005-05-21T1
 
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 rev = base_revision()
 
 -- check that a correct usage produces correctly formatted output
============================================================
--- tests/automate_get_revision/__driver__.lua	86d844d42180fe5d15d92feb3ead32d41438cec3
+++ tests/automate_get_revision/__driver__.lua	7f33cdf44581199ffc5943d2c565a494d2d77085
@@ -6,7 +6,7 @@ check(mtn("commit", "--date=2005-05-21T1
 
 addfile("foo", "blah\n")
 check(mtn("commit", "--date=2005-05-21T12:30:51",
-          "--branch=testbranch", "--message=blah-blah"), 0, false, false)
+          "--message=blah-blah"), 0, false, false)
 base = base_revision()
 
 -- check that a correct usage produces correctly formatted output
============================================================
--- tests/b_t_and_a_selector_globbing/__driver__.lua	39d20812db86092429f4c37edd7ff23734a1a2b1
+++ tests/b_t_and_a_selector_globbing/__driver__.lua	6863c3e5f38499319f4efbd077e23f22e85b345c
@@ -19,7 +19,8 @@ writefile("testfile", "blub blub")
 check(mtn("tag", R3, "foobarbaz"), 0, false, false)
 
 writefile("testfile", "blub blub")
-check(mtn("commit", "-m", "foo", "-b", "bar", "--author", "address@hidden"), 0, false, false)
+check(mtn("branch", "bar"), 0, false, false)
+check(mtn("commit", "-m", "foo", "--author", "address@hidden"), 0, false, false)
 R4=base_revision()
 
 selmap("b:testbranch", {R1})
============================================================
--- tests/can_execute_things/__driver__.lua	b679678b80b65e6c6ae604e8d00fba852d4ad071
+++ tests/can_execute_things/__driver__.lua	07e9c4953c928a60f9255d9a4dac64e28dc8ae7d
@@ -15,5 +15,5 @@ check(mtn("add", "cphook.lua"), 0, false
 writefile("testfile", "blah blah")
 
 check(mtn("add", "cphook.lua"), 0, false, false)
-check(mtn("--branch=testbranch", "--rcfile=cphook.lua", "commit", "--message=test"), 0, false, false)
+check(mtn("--rcfile=cphook.lua", "commit", "--message=test"), 0, false, false)
 check(exists("testfile.copied"))
============================================================
--- tests/check_--log/__driver__.lua	ab40c2b60c45d6ad8b93b59f047d144993fbd143
+++ tests/check_--log/__driver__.lua	4f92e4011c85b609551d007b2e4de137acf37df3
@@ -1,11 +1,10 @@ check(mtn("add", "input.txt"), 0, false,
 
 mtn_setup()
 
 writefile("input.txt", "random content")
 
 check(mtn("add", "input.txt"), 0, false, false)
+check(mtn("--log=log.log", "commit", "-m", "test"), 0, true, false)
 
-check(mtn("--branch=testbranch", "--log=log.log", "commit", "-m", "test"), 0, true, false)
-
 check(not qgrep('^mtn:', "stdout"))
 check(qgrep('^mtn:', "log.log"))
============================================================
--- tests/check_later_and_earlier_selectors/__driver__.lua	f3ab1f5511f5367c72993bbff9d19d7b002b3835
+++ tests/check_later_and_earlier_selectors/__driver__.lua	e31b4b771ee568dd6bdd3b3fd789c3b091e660d2
@@ -5,19 +5,20 @@ copy("testfile", "testfile1")
 
 addfile("testfile", "this is just a file")
 copy("testfile", "testfile1")
-check(mtn("commit", "--date=2005-03-11T20:33:01", "--branch=foo",
+check(mtn("branch", "foo"), 0, false, false)
+check(mtn("commit", "--date=2005-03-11T20:33:01",
           "--message=march"), 0, false, false)
 revs.first = base_revision()
 
 writefile("testfile", "Now, this is a different file")
 copy("testfile", "testfile2")
-check(mtn("commit", "--date=2005-04-22T12:15:00", "--branch=foo",
+check(mtn("commit", "--date=2005-04-22T12:15:00",
           "--message=aprila"), 0, false, false)
 revs.second = base_revision()
 
 writefile("testfile", "And we change it a third time")
 copy("testfile", "testfile3")
-check(mtn("commit", "--date=2005-04-24T07:44:39", "--branch=foo",
+check(mtn("commit", "--date=2005-04-24T07:44:39",
           "--message=aprilb"), 0, false, false)
 revs.third = base_revision()
 
============================================================
--- tests/checkout_creates__MTN_log/__driver__.lua	0cb0297db597db9d617a852e9fc5b8d04481172b
+++ tests/checkout_creates__MTN_log/__driver__.lua	43f2026e4979f71e2b0324865a2b2c80cd924062
@@ -9,7 +9,7 @@ check(mtn("add", "input.txt"), 0, false,
 
 check(mtn("add", "input.txt"), 0, false, false)
 
-check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 0, false, false)
+check(mtn("--rcfile=commit_log.lua", "commit"), 0, false, false)
 
 check(mtn("--branch=testbranch", "checkout", "testbranch"), 0, false, true)
 
============================================================
--- tests/clone_creates__MTN_log/__driver__.lua	da936653810379282e5456c38552448f100186eb
+++ tests/clone_creates__MTN_log/__driver__.lua	3abf35888b99a48508900ee3c6f8c86705877c40
@@ -9,7 +9,7 @@ check(mtn("add", "input.txt"), 0, false,
 
 check(mtn("add", "input.txt"), 0, false, false)
 
-check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 0, false, false)
+check(mtn("--rcfile=commit_log.lua", "commit"), 0, false, false)
 
 testURI="file:" .. test.root .. "/test.db"
 
============================================================
--- tests/commit_update_multiple_heads_message/__driver__.lua	c4b15a47da1bda099901e5091836754154fdba3b
+++ tests/commit_update_multiple_heads_message/__driver__.lua	4e65aeed2463edd034af42ca2669cfaee009351c
@@ -10,7 +10,12 @@ function local_ci(br)
 
 -- like the normal commit function, except it catches the output
 function local_ci(br)
-  check(mtn("commit", "--message=blah-blan", "--branch", br), 0, true, true)
+  check(mtn("automate", "get_option", "branch"), 0, true, false)
+  current_branch = trim(readfile("stdout"))
+  if br ~= current_branch then
+    check(mtn("branch", br), 0, false, false)
+  end
+  check(mtn("commit", "--message=blah-blan"), 0, true, true)
 end
 
 writefile("f", "base data")
============================================================
--- tests/commit_using__MTN_log/__driver__.lua	a9b708bd811300cc5c4ca78b932f50f7f93341cf
+++ tests/commit_using__MTN_log/__driver__.lua	d6d1a5d20d1e38805bb9b0e36ca0b6e4debe30b4
@@ -12,7 +12,7 @@ check(mtn("add", "input.txt"), 0, false,
 
 --this should now fail, given that the log file has content and we don't
 --remove the 'magic' line
-check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit"), 1, false, true)
+check(mtn("--rcfile=commit_log.lua", "commit"), 1, false, true)
 check(qgrep('magic line; commit cancelled', "stderr"))
 
 check(exists("_MTN/log"))
@@ -20,7 +20,7 @@ check(fsize("_MTN/log") > 0)
 
 --this should pass, as the lua hook now returns a string that doesn't contain
 --the 'magic' line
-check(mtn("--branch=testbranch", "--rcfile=commit_log_modified_return.lua", "commit"), 0, false, false)
+check(mtn("--rcfile=commit_log_modified_return.lua", "commit"), 0, false, false)
 
 tsha = base_revision()
 check(exists("_MTN/log"))
============================================================
--- tests/commit_validation_lua_hook/__driver__.lua	9e779e1a652d35a354e0d1887f7a493d308398b1
+++ tests/commit_validation_lua_hook/__driver__.lua	56ef1c2919ad5da86c9387930a01fb4642375577
@@ -7,7 +7,7 @@ check(get("errmsg"))
 
 check(mtn("add", "input.txt"), 0, false, false)
 check(get("errmsg"))
-check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "denyme"), 1, false, true)
+check(mtn("--rcfile=commit_validate.lua", "commit", "-m", "denyme"), 1, false, true)
 canonicalize("stderr")
 check(samefile("errmsg", "stderr"))
+check(mtn("--rcfile=commit_validate.lua", "commit", "-m", "allowme"), 0, false, false)
-check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "allowme"), 0, false, false)
============================================================
--- tests/commit_with_--message-file/__driver__.lua	c489098cf8e352319705e1965af1632d06f68316
+++ tests/commit_with_--message-file/__driver__.lua	50544af1db255b049a1ab3d511d7c046abc80c90
@@ -11,7 +11,7 @@ writefile("msgfile.txt", "this commit us
 
 writefile("msgfile.txt", "this commit uses the --message-file option")
 
-check(mtn("--branch=testbranch", "commit", "--message-file=msgfile.txt"), 0, false, false)
+check(mtn("commit", "--message-file=msgfile.txt"), 0, false, false)
 
 tsha = base_revision()
 check(mtn("ls", "certs", tsha), 0, true, false)
@@ -28,7 +28,8 @@ check(indir("alt_wrk", mtn("add", "input
 
 check(indir("alt_wrk", mtn("add", "input1.txt")), 0, false, false)
 
-check(indir("alt_wrk", mtn("--branch=outbranch", "commit", "--message-file=../message-out-of-copy.txt")), 0, false, false)
+check(indir("alt_wrk", mtn("branch", "outbranch")), 0, false, false)
+check(indir("alt_wrk", mtn("commit", "--message-file=../message-out-of-copy.txt")), 0, false, false)
 
 tsha = indir("alt_wrk", {base_revision})[1]()
 check(indir("alt_wrk", mtn("ls", "certs", tsha)), 0, true, false)
@@ -39,13 +40,13 @@ addfile("input2.txt", "another file")
 ----------------------
 addfile("input2.txt", "another file")
 
-check(mtn("--branch=testbranch", "commit", "--message-file=to-be-or-not-to-be.txt"), 1, false, false)
+check(mtn("commit", "--message-file=to-be-or-not-to-be.txt"), 1, false, false)
 
 ----------------------
 --then verify that --message and --message-file together cause an error
 ----------------------
 
-check(mtn("--branch=testbranch", "commit", "--message-file=msgfile.txt",
+check(mtn("commit", "--message-file=msgfile.txt",
           "--message=also a message"), 1, false, false)
 
 -- --------------------
@@ -56,5 +57,5 @@ writefile("_MTN/log", "Log entry")
 
 writefile("_MTN/log", "Log entry")
 
-check(mtn("--branch=testbranch", "--rcfile=commit_log.lua", "commit",
+check(mtn("--rcfile=commit_log.lua", "commit",
           "--message-file=msgfile.txt"), 1, false, false)
============================================================
--- tests/commit_writes_message_back_to__MTN_log/__driver__.lua	7758bd1d4316f2c3e80cc4018a4b3ab4067137b7
+++ tests/commit_writes_message_back_to__MTN_log/__driver__.lua	5fe66003c9fb4ad9092b473a1d9513bec2c093a8
@@ -10,9 +10,8 @@ check(get("my_hook.lua"))
 check({"chmod", "a-w", "test.db"})
 
 check(get("my_hook.lua"))
+check(mtn("commit", "--rcfile=my_hook.lua"), 1, false, false)
 
-check(mtn("commit", "-btestbranch", "--rcfile=my_hook.lua"), 1, false, false)
-
 check(samelines("_MTN/log", {"foobar"}))
 
 remove("_MTN/log")
@@ -25,7 +24,7 @@ writefile("_MTN/log", "")
 --   <fixup>
 --   $ mtn commit -m 'foo'
 --   error, _MTN/log non-empty and -m specified
-check(mtn("commit", "-btestbranch", "-m", "blah blah"), 1, false, false)
+check(mtn("commit", "-m", "blah blah"), 1, false, false)
 
 -- So _MTN/log should still be empty
 check(fsize("_MTN/log") == 0)
============================================================
--- tests/database_is_closed_on_signal_exit/__driver__.lua	84fd9f4bec67e21eb3e98ebd38082956a3578e46
+++ tests/database_is_closed_on_signal_exit/__driver__.lua	09a930716f35e9c043cd457bbac32ee7b073581c
@@ -19,7 +19,7 @@ writefile("wait.lua", "function get_pass
 
 
 -- SIGTERM first
-process = bg(mtn("--rcfile=wait.lua", "-btestbranch", "ci", "-mx"), false, false, false)
+process = bg(mtn("--rcfile=wait.lua", "ci", "-mx"), false, false, false)
 sleep(2)
 check(exists("test.db-journal"))
 kill(process.pid, 15)
@@ -29,7 +29,7 @@ xfail_if(exists("test.db-journal"))
 xfail_if(exists("test.db-journal"))
 
 -- and again for SIGINT
-process = bg(mtn("--rcfile=wait.lua", "-btestbranch", "ci", "-mx"), false, false, false)
+process = bg(mtn("--rcfile=wait.lua", "ci", "-mx"), false, false, false)
 sleep(2)
 check(exists("test.db-journal"))
 kill(process.pid, 2)
@@ -39,7 +39,7 @@ xfail_if(exists("test.db-journal"))
 xfail_if(exists("test.db-journal"))
 
 -- should *not* be cleaned up for SIGSEGV
-process = bg(mtn("--rcfile=wait.lua", "-btestbranch", "ci", "-mx"), false, false, false)
+process = bg(mtn("--rcfile=wait.lua", "ci", "-mx"), false, false, false)
 sleep(2)
 check(exists("test.db-journal"))
 kill(process.pid, 11)
============================================================
--- tests/disallowing_persistence_of_passphrase/__driver__.lua	f958eef23ce1d9afe61383d47a3bca777e206a8a
+++ tests/disallowing_persistence_of_passphrase/__driver__.lua	a531d0441c19c9b4c83f9e78eca496af477594ba
@@ -9,11 +9,11 @@ writefile("input.txt", "version 1 of the
 addfile("input.txt", "version 0 of the file")
 writefile("input.txt", "version 1 of the file")
 
-check(mtn("--branch=testbranch", "--rcfile=persist.lua",
+check(mtn("--rcfile=persist.lua",
           "commit", "--message=blah-blah"),
       1, false, false, "address@hidden")
 
-check(mtn("--branch=testbranch", "--rcfile=persist.lua",
+check(mtn("--rcfile=persist.lua",
           "commit", "--message=blah-blah"),
       0, false, false, string.rep("address@hidden", 4))
 
============================================================
--- tests/do_not_log_the_result_of_hook_get_passphrase/__driver__.lua	d8eaa394152f4da3e96fddff4b9c1c8f13a5a927
+++ tests/do_not_log_the_result_of_hook_get_passphrase/__driver__.lua	1faf2b751278037ff732f366e471c9049052c68c
@@ -8,8 +8,7 @@ check(mtn("genkey", "quux"), 0, false, f
 check(get("hook.lua"))
 pass = "xyzzypassphrasexyzzy"
 check(mtn("genkey", "quux"), 0, false, false, string.rep(pass.."\n", 2))
-
-check(mtn("--branch=testbranch", "--debug", "commit", "-m", "foo",
+check(mtn("--debug", "commit", "-m", "foo",
           "--rcfile=hook.lua", "-k", "quux"), 0, false, true)
 
 check(not qgrep("xyzzypassphrasexyzzy", "stderr"))
============================================================
--- tests/empty_environment/__driver__.lua	4e70feabad49fb196e7637136cd66b5a4f54b59d
+++ tests/empty_environment/__driver__.lua	63329ebcd24fc882f03f517fc4e75a709fbff8eb
@@ -31,4 +31,4 @@ check(noenv_mtn("add", "testfile"), 0, f
 check(noenv_mtn("--help"), 0, false, false)
 writefile("testfile", "blah blah")
 check(noenv_mtn("add", "testfile"), 0, false, false)
+check(noenv_mtn("commit", "--message=foo"), 0, false, false)
-check(noenv_mtn("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
============================================================
--- tests/listing_workspace_manifests/__driver__.lua	2a0a4649b1e147bfe14eb15666ce1ff47aa77a23
+++ tests/listing_workspace_manifests/__driver__.lua	95c44a3cc396af1974e3a9cf2989ab224f70369f
@@ -18,7 +18,7 @@ check(sort("stdout"), 0, "bar\ndir\ndir/
 check(mtn("ls", "known"), 0, true)
 check(sort("stdout"), 0, "bar\ndir\ndir/bar\ndir/foo\nfoo\n")
 
-check(mtn("--branch=testbranch", "commit", "--message=committed"), 0, false, false)
+check(mtn("commit", "--message=committed"), 0, false, false)
 
 check(mtn("ls", "known"), 0, true)
 check(sort("stdout"), 0, "bar\ndir\ndir/bar\ndir/foo\nfoo\n")
============================================================
--- tests/log_--brief/__driver__.lua	5fe08b4182a0dd9349743363da14eb0c4582fcea
+++ tests/log_--brief/__driver__.lua	36d69ea2af91ecf4247411ed423c52203ff8d84c
@@ -1,16 +1,17 @@ addfile("testfile", "blah blah")
 
 mtn_setup()
 
 addfile("testfile", "blah blah")
-check(mtn("commit", "-b", "testbranch", "--date", "2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
+check(mtn("commit", "--date", "2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
 R0=base_revision()
 
 writefile("testfile", "stuff stuff")
-check(mtn("commit", "-b", "testbranch", "--date", "2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
+check(mtn("commit", "--date", "2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
 R1=base_revision()
 
 writefile("testfile", "other other")
-check(mtn("commit", "-b", "otherbranch", "--date", "2005-08-16T03:16:05", "-m", "foo"), 0, false, false)
+check(mtn("branch", "otherbranch"), 0, false, false)
+check(mtn("commit", "--date", "2005-08-16T03:16:05", "-m", "foo"), 0, false, false)
 R2=base_revision()
 
 check(mtn("log", "--brief", "--no-graph"), 0, true, false)
============================================================
--- tests/log_and_selectors_returning_multiple_rids/__driver__.lua	ecdd5f0daf85648b2f9a2eefc5ac537a62676124
+++ tests/log_and_selectors_returning_multiple_rids/__driver__.lua	35300f5beb9e735b9ff8ae26d5527a729b9d8e7e
@@ -1,18 +1,18 @@ addfile("testfile", "blah blah")
 
 mtn_setup()
 
 -- testcase for bug --15877
 
 addfile("testfile", "blah blah")
-check(mtn("commit", "-b", "testbranch", "--date=2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
+check(mtn("commit", "--date=2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
 R0=base_revision()
 
 writefile("testfile", "stuff stuff")
-check(mtn("commit", "-b", "testbranch", "--date=2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
+check(mtn("commit", "--date=2005-08-16T03:16:00", "-m", "foo"), 0, false, false)
 R1=base_revision()
 
 writefile("testfile", "other other")
-check(mtn("commit", "-b", "testbranch", "--date=2005-08-16T03:16:05", "-m", "foo"), 0, false, false)
+check(mtn("commit", "--date=2005-08-16T03:16:05", "-m", "foo"), 0, false, false)
 R2=base_revision()
 
 check(raw_mtn("--db", test.root.."/test.db", "--root", test.root,
============================================================
--- tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua	4ec9d25eab337911fbab21281d28c945482a0ce6
+++ tests/netsync_epochs_are_not_sent_upstream_by_pull/__driver__.lua	0f1952ca7f9012ac4e064e1c37713d6443c55770
@@ -13,7 +13,8 @@ check(mtn2("add", "testfile"), 0, false,
 check(mtn2("setup", "--branch=testbranch", "."))
 writefile("otherfile", "some data")
 check(mtn2("add", "testfile"), 0, false, false)
-check(mtn2("commit", "--message=foo", "--branch=testbranch.subbranch"), 0, false, false)
+check(mtn2("branch", "testbranch.subbranch"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 
 netsync.pull("testbranch.*")
 
============================================================
--- tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua	cc83b2b114c4065c65f166c731e7b9090892bf83
+++ tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua	1f12047a1361126ee9641f08caf0bd2511d13d9f
@@ -6,7 +6,7 @@ check(mtn2("add", "testfile"), 0, false,
 
 writefile("testfile", "some data")
 check(mtn2("add", "testfile"), 0, false, false)
-check(mtn2("commit", "--message=foo", "--branch=testbranch"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 revs[0] = base_revision()
 
 netsync.push("testbranch")
@@ -19,7 +19,8 @@ check(mtn2("add", "otherfile"), 0, false
 rename("stdout", "orig-epochs")
 writefile("otherfile", "other data")
 check(mtn2("add", "otherfile"), 0, false, false)
-check(mtn2("commit", "--message=foo", "--branch=otherbranch"), 0, false, false)
+check(mtn2("branch", "otherbranch"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 -- Run an irrelevant netsync, just to force epochs to be regenerated
 srv = netsync.start(2)
 srv:sync("otherbranch", 3)
@@ -32,7 +33,7 @@ writefile("testfile", "new version of da
 check_different_stdout{"list", "epochs"}
 
 writefile("testfile", "new version of data")
-check(mtn2("commit", "--message=foo", "--branch=testbranch"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 revs[1] = base_revision()
 
 -- change the epochs in the second db
============================================================
--- tests/netsync_transfers_public_keys/__driver__.lua	7c33043f7bea601ceb114aa57853ca0ecdbbdcca
+++ tests/netsync_transfers_public_keys/__driver__.lua	9402ab027c9214de88a45ded202ca6089093cc80
@@ -31,8 +31,8 @@ writefile("testfile", "version 1 of test
 -- Now commit a version that does use the new key, and make sure that
 -- now it does get transferred.
 writefile("testfile", "version 1 of test file")
-check(mtn("--branch=testbranch", "--message=blah-blah",
-          "address@hidden", "commit"), 0, false, false)
+check(mtn("--message=blah-blah", "address@hidden",
+          "commit"), 0, false, false)
 
 netsync.pull("testbranch")
 
============================================================
--- tests/normalized_filenames/__driver__.lua	2948e8e6933cdf7851d6892df016aec48bf54525
+++ tests/normalized_filenames/__driver__.lua	5915d21d8d34634dde51930c7771bedf1382f8e8
@@ -11,4 +11,5 @@ check(mtn("automate", "get_revision"), 3
 
 check(mtn("automate", "get_manifest_of"), 3, false, false)
 check(mtn("automate", "get_revision"), 3, false, false)
+check(mtn("branch", "foo"), 0, false, false)
+check(mtn("commit", "--message=foo"), 3, false, false)
-check(mtn("commit", "--message=foo", "--branch=foo"), 3, false, false)
============================================================
--- tests/persistence_of_passphrase/__driver__.lua	e5a6a36c72e537682cb5f37211d2508d42060a9c
+++ tests/persistence_of_passphrase/__driver__.lua	9cbc51fc2644a7208ba28e6770ae927c40b5466c
@@ -9,7 +9,7 @@ writefile("input.txt", "version 1 of the
 
 writefile("input.txt", "version 1 of the file\n")
 
-check(mtn("--branch=testbranch", "--rcfile=persist.lua", "--message=blah-blah", "commit"), 0, false, false, "address@hidden")
+check(mtn("--rcfile=persist.lua", "--message=blah-blah", "commit"), 0, false, false, "address@hidden")
 
 tsha = base_revision()
 
============================================================
--- tests/persistent_netsync_server_-_keys/__driver__.lua	d9a6a5c55dc85ad55f06cb316dc4231ada807e93
+++ tests/persistent_netsync_server_-_keys/__driver__.lua	4eba9609a7681bcb0acaf57e51906b14de57715a
@@ -5,7 +5,7 @@ check(mtn2("add", "testfile"), 0, false,
 
 writefile("testfile", "I am you and you are me and we are all together.")
 check(mtn2("add", "testfile"), 0, false, false)
-check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 
 check(mtn2("genkey", "address@hidden"), 0, false, false, string.rep("address@hidden",2))
 
@@ -18,7 +18,7 @@ writefile("testfile", "stuffty stuffty")
 check(not qgrep("address@hidden", "stdout"))
 
 writefile("testfile", "stuffty stuffty")
-check(mtn2("commit", "--branch=testbranch", "--message=foo", "address@hidden"), 0, false, false)
+check(mtn2("commit", "--message=foo", "address@hidden"), 0, false, false)
 
 srv:push("testbranch", 2)
 srv:pull("testbranch", 3)
============================================================
--- tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua	ae88e5fbf13f1c3b47befa86b9e0397e9b835f20
+++ tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua	d5c2a4ab7e1b2cb6ed804ea5a49e70ac39aba390
@@ -7,14 +7,14 @@ check(mtn2("add", "testfile"), 0, false,
 
 writefile("testfile", "foo bar")
 check(mtn2("add", "testfile"), 0, false, false)
-check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 revs[1] = base_revision()
 
 remove("_MTN")
 check(mtn3("setup", "--branch=testbranch", "."), 0, false, false)
 writefile("otherfile", "baz quux")
 check(mtn3("add", "otherfile"), 0, false, false)
-check(mtn3("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
+check(mtn3("commit", "--message=foo"), 0, false, false)
 revs[2] = base_revision()
 
 srv = netsync.start()
@@ -39,14 +39,14 @@ writefile("otherfile", "foo bar, baz, al
 -- And now make sure it works for children, where there are diffs and all
 
 writefile("otherfile", "foo bar, baz, also quux (on off days)")
-check(mtn3("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
+check(mtn3("commit", "--message=foo"), 0, false, false)
 revs[3] = base_revision()
 
 remove("_MTN")
 remove("testfile")
 check(mtn2("checkout", "--revision", revs[1], "."), 0, false, false)
 writefile("testfile", "ptang")
-check(mtn2("commit", "--branch=testbranch", "--message=foo"), 0, false, false)
+check(mtn2("commit", "--message=foo"), 0, false, false)
 revs[4] = base_revision()
 
 -- And add a cert on an old revision
============================================================
--- tests/read_and_convert_old_privkey_packet/__driver__.lua	4da19713ba2c6c334cc39d6f186e3bbe23d0506f
+++ tests/read_and_convert_old_privkey_packet/__driver__.lua	d4a1b4e085b5a7b4f10b9f9f09ef88483a3bf095
@@ -14,5 +14,5 @@ addfile("foo", "foo")
 
 -- check that we can use the key we just read
 -- if it imported wrong, it'll fail by not accepting the passphrase
+check(mtn("branch", "foo"), 0, false, false)
+check(mtn("ci", "-mbar"), 0, false, false, string.rep("address@hidden", 2))
-
-check(mtn("ci", "-bfoo", "-mbar"), 0, false, false, string.rep("address@hidden", 2))
============================================================
--- tests/renaming_and_editing_a_file/__driver__.lua	0a642d8215a047f22a1baf695ec0ecf437092c09
+++ tests/renaming_and_editing_a_file/__driver__.lua	1badcd10e583f836a8f29da2190e32a8d090c102
@@ -10,7 +10,7 @@ check(mtn("add", "foo"), 0, false, false
 -- produce root
 rename("foo1", "foo")
 check(mtn("add", "foo"), 0, false, false)
-check(mtn("--branch=testbranch", "commit", "--message=root"), 0, false, false)
+check(mtn("commit", "--message=root"), 0, false, false)
 root_r_sha=base_revision()
 root_f_sha=sha1("foo")
 
============================================================
--- tests/schema_migration/__driver__.lua	d708709c691b1536d54702969a8ffbffd5fa3c5f
+++ tests/schema_migration/__driver__.lua	ce9c3d914349381454c18b6218442797ffefa8f3
@@ -42,7 +42,8 @@ check(mtn("attr", "set", ".", "dir_key",
 addfile("testfile2", "f2v1\n")
 check(mtn("attr", "set", "testfile1", "testfile1_key", "initial_value"), 0, false, false)
 check(mtn("attr", "set", ".", "dir_key", "initial_value"), 0, false, false)
-check(mtn("commit", "--branch=testbranch1", "--date=1999-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch1"), 0, false, false)
+check(mtn("commit", "--date=1999-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
 rev = base_revision()
 
 check(mtn("cert", rev, "somekey", "somevalue"), 0, false, false)
@@ -51,21 +52,23 @@ check(mtn("attr", "set", ".", "dir_key",
 addfile("testfile3", "f3v1\n")
 check(mtn("attr", "drop", "testfile1", "testfile1_key"), 0, false, false)
 check(mtn("attr", "set", ".", "dir_key", "new_value"), 0, false, false)
-check(mtn("commit", "--branch=testbranch2", "--date=2000-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch2"), 0, false, false)
+check(mtn("commit", "--date=2000-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
 
 revert_to(rev)
 remove("testfile3")
 
 writefile("testfile2", "f2v2\n")
 addfile("testfile4", "f4v1\n")
-check(mtn("commit", "--branch=testbranch1", "--date=2001-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("commit", "--date=2001-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
 
 check(mtn("propagate", "--date=2002-01-01T12:00:00", "testbranch2", "testbranch1"), 0, false, false)
 check(mtn("update"), 0, false, false)
 
 check(mtn("drop", "--bookkeep-only", "testfile1"), 0, false, false)
 writefile("testfile4", "f4v2\n")
-check(mtn("commit", "--branch=testbranch3", "--date=2003-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch3"), 0, false, false)
+check(mtn("commit", "--date=2003-01-01T12:00:00", "--message-file=blah_blah.txt"), 0, false, false)
 
 rename("test.db", "latest.mtn")
 
============================================================
--- tests/schema_migration_with_rosterify/__driver__.lua	5b2bd19e135432bf53511d7fd1f422b5177544c4
+++ tests/schema_migration_with_rosterify/__driver__.lua	ea7110d3182fb9f7dabe4a150fd4962cb1c9f77d
@@ -30,21 +30,23 @@ addfile("testfile2", "f2v1\n")
 
 addfile("testfile1", "f1v1\n")
 addfile("testfile2", "f2v1\n")
-check(mtn("commit", "--branch=testbranch1", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch1"), 0, false, false)
+check(mtn("commit", "--message-file=blah_blah.txt"), 0, false, false)
 rev=base_revision()
 
 check(mtn("cert", rev, "somekey", "somevalue"), 0, false, false)
 
 writefile("testfile1", "f1v2\n")
 addfile("testfile3", "f3v1\n")
-check(mtn("commit", "--branch=testbranch2", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch2"), 0, false, false)
+check(mtn("commit", "--message-file=blah_blah.txt"), 0, false, false)
 
 revert_to(rev)
 remove("testfile3")
 
 writefile("testfile2", "f2v2\n")
 addfile("testfile4", "f4v1\n")
-check(mtn("commit", "--branch=testbranch1", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("commit", "--message-file=blah_blah.txt"), 0, false, false)
 
 check(get("old_revs_propagate_log"))
 check(mtn("propagate", "testbranch2", "testbranch1",
@@ -53,7 +55,8 @@ writefile("testfile4", "f4v2\n")
 
 check(mtn("drop", "--bookkeep-only", "testfile1"), 0, false, false)
 writefile("testfile4", "f4v2\n")
-check(mtn("commit", "--branch=testbranch3", "--message-file=blah_blah.txt"), 0, false, false)
+check(mtn("branch", "testbranch3"), 0, false, false)
+check(mtn("commit", "--message-file=blah_blah.txt"), 0, false, false)
 
 -- Exception to this code being untouchable:
 -- This line may have to be modified at a later date; this won't cause
============================================================
--- tests/short_options_work_correctly/__driver__.lua	2ff2788145feea06d2e1336846ca22cdcc3fa37c
+++ tests/short_options_work_correctly/__driver__.lua	3a102e5e93430d2cf82d7bc513c9d014d32139ad
@@ -25,5 +25,6 @@ remove("_MTN/log")
 remove("_MTN/log")
 
 -- and it does work with a key
-check(short_mtn("-k", "address@hidden", "-b", "test.branch", "commit",
+check(short_mtn("branch", "test.branch"), 0, false, false)
+check(short_mtn("-k", "address@hidden", "commit",
                 "-d", "test.db", "-m", "happy"), 0, false, false)
============================================================
--- tests/sticky_branches/__driver__.lua	ed9188c29ff7be00e5ea2b7cde67b17432f8adda
+++ tests/sticky_branches/__driver__.lua	3537b6777ba7cf8fde74a3faa23d149cefe8556a
@@ -22,7 +22,8 @@ writefile("codir/foo", "newbranch newbra
 
 -- commit saves given branch
 writefile("codir/foo", "newbranch newbranch")
-check(indir("codir", mtn("commit", "--branch=otherbranch", "--message=foo")), 0, false, false)
+check(indir("codir", mtn("branch", "otherbranch")), 0, false, false)
+check(indir("codir", mtn("commit", "--message=foo")), 0, false, false)
 writefile("codir/foo", "newbranch 2 newbranch 2")
 check(indir("codir", mtn("commit", "--message=foo")), 0, false, false)
 check(mtn("checkout", "--branch=otherbranch", "otherdir"), 0, false, false)
@@ -41,11 +42,13 @@ check(indir("third1", mtn("add", "a")), 
 check(mtn("co", "--branch=testbranch", "third1"), 0, false, false)
 writefile("third1/a", "1a")
 check(indir("third1", mtn("add", "a")), 0, false, false)
-check(indir("third1", mtn("commit", "--branch=third", "--message=foo")), 0, false, false)
+check(indir("third1", mtn("branch", "third")), 0, false, false)
+check(indir("third1", mtn("commit", "--message=foo")), 0, false, false)
 check(mtn("co", "--branch=testbranch", "third2"), 0, false, false)
 writefile("third2/b", "2b")
 check(indir("third2", mtn("add", "b")), 0, false, false)
-check(indir("third2", mtn("commit", "--branch=third", "--message=foo")), 0, false, false)
+check(indir("third2", mtn("branch", "third")), 0, false, false)
+check(indir("third2", mtn("commit", "--message=foo")), 0, false, false)
 check(indir("codir", mtn("merge", "--branch=third")), 0, false, false)
 check(mtn("automate", "heads", "third"), 0, true, false)
 rename("stdout", "old-third-heads")
============================================================
--- tests/update_does_not_stomp_non-monotone_files/__driver__.lua	72480446e72630b71f4fea0d2fc58d043e2cab9a
+++ tests/update_does_not_stomp_non-monotone_files/__driver__.lua	a61a18dce188bd18d8ad03ac3a195d1b669e624c
@@ -20,14 +20,14 @@ check(indir("alicewd", mtn("--root=.", "
 copy("initial", "alicewd/initial")
 check(mtn("--branch=testbranch", "setup", "alicewd"), 0, false, false)
 check(indir("alicewd", mtn("--root=.", "add", "initial")), 0, false, false)
-check(indir("alicewd", mtn("--branch=testbranch", "--root=.", "commit", "-m", 'initial commit')), 0, false, false)
+check(indir("alicewd", mtn("--root=.", "commit", "-m", 'initial commit')), 0, false, false)
 copy("foo.alice", "alicewd/foo")
 
 -- Bob does add of file foo, and commits
 check(mtn("--branch=testbranch", "checkout", "bobwd"), 0, false, false)
 copy("foo.bob", "bobwd/foo")
 check(indir("bobwd", mtn("--root=.", "add", "foo")), 0, false, false)
-check(indir("bobwd", mtn("--branch=testbranch", "--root=.", "commit", "-m", 'bob commit')), 0, false, false)
+check(indir("bobwd", mtn("--root=.", "commit", "-m", 'bob commit')), 0, false, false)
 rev = indir("bobwd", {base_revision})[1]()
 
 -- Alice does her update, discovers foo has been stomped!
============================================================
--- testsuite.lua	30b370324e7794c693af1e36ee7360e348a3a868
+++ testsuite.lua	febf08a23201941561bf7c6f29269d85c6516e1a
@@ -116,7 +116,12 @@ function commit(branch, message, mt)
   if branch == nil then branch = "testbranch" end
   if message == nil then message = "blah-blah" end
   if mt == nil then mt = mtn end
-  check(mt("commit", "--message", message, "--branch", branch), 0, false, false)
+  check(mt("automate", "get_option", "branch"), 0, true, false)
+  current_branch = trim(readfile("stdout"))
+  if branch ~= current_branch then
+    check(mt("branch", branch), 0, false, false)
+  end
+  check(mt("commit", "--message", message), 0, false, false)
 end
 
 function sha1(what)