# 
# 
# patch "ChangeLog"
#  from [30fc6a3dc8a136e76c6cd8184de530310e02fcd4]
#    to [5c754ab237cfda3cf5ed76cdef17bec2edac0df6]
# 
# patch "tests/checking_a_few_command_specific_options/__driver__.lua"
#  from [b47bc864decd4066304266671df4bbe8c0190274]
#    to [76a00dae43cdd5c6d0f0349b0d1f91b7c8cf1617]
# 
============================================================
--- ChangeLog	30fc6a3dc8a136e76c6cd8184de530310e02fcd4
+++ ChangeLog	5c754ab237cfda3cf5ed76cdef17bec2edac0df6
@@ -1,5 +1,10 @@
 2006-07-05  Nathaniel Smith  <address@hidden>
 
+	* tests/checking_a_few_command_specific_options/__driver__.lua:
+	Add test for minor bug reported by Marcin 'hrw' Juszkiewicz.
+
+2006-07-05  Nathaniel Smith  <address@hidden>
+
 	* diff_patch.cc (get_ancestral_roster): Update comment and add an
 	invariant.
 
============================================================
--- tests/checking_a_few_command_specific_options/__driver__.lua	b47bc864decd4066304266671df4bbe8c0190274
+++ tests/checking_a_few_command_specific_options/__driver__.lua	76a00dae43cdd5c6d0f0349b0d1f91b7c8cf1617
@@ -10,3 +10,10 @@
 check(mtn("--last=1", "log"), 0, false, false)
 
 check(mtn("--depth=0", "status"), 0, false, false)
+check(mtn("--depth=0", "pubkey", "address@hidden"), 1, false, false)
+
+-- command-specific options with non-existent commands give correct error
+-- message:
+check(mtn("--branch=testbranch", "loggg"), 1, "", true)
+output = readfile("stderr")
+xfail_if(true, string.find(output, "unknown command"))