Merge branch 'v2' into migrators

This commit is contained in:
Dan Buch 2016-05-30 14:00:32 -04:00
commit 1d13fa8140
2 changed files with 4 additions and 4 deletions

View File

@ -670,8 +670,8 @@ func stringifyFlag(f Flag) string {
defaultValueString := "" defaultValueString := ""
val := fv.FieldByName("Value") val := fv.FieldByName("Value")
if val.IsValid() && val.Kind() != reflect.Bool { if val.IsValid() {
needsPlaceholder = true needsPlaceholder = val.Kind() != reflect.Bool
defaultValueString = fmt.Sprintf(" (default: %v)", val.Interface()) defaultValueString = fmt.Sprintf(" (default: %v)", val.Interface())
if val.Kind() == reflect.String && val.String() != "" { if val.Kind() == reflect.String && val.String() != "" {

View File

@ -15,8 +15,8 @@ var boolFlagTests = []struct {
name string name string
expected string expected string
}{ }{
{"help", "--help\t"}, {"help", "--help\t(default: false)"},
{"h", "-h\t"}, {"h", "-h\t(default: false)"},
} }
func TestBoolFlagHelpOutput(t *testing.T) { func TestBoolFlagHelpOutput(t *testing.T) {