Merge branch 'jc/send-email-sensible-encoding'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:19 +0000 (15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:19 +0000 (15:40 -0800)
"git send-email" used to accept a mistaken "y" (or "yes") as an
answer to "What encoding do you want to use [UTF-8]? " without
questioning. Now it asks for confirmation when the answer looks
too short to be a valid encoding name.

* jc/send-email-sensible-encoding:
send-email: ask confirmation if given encoding name is very short

git-send-email.perl
index 3092ab356c765cd593d2a988d020665c8b626ea1..848f17623a88af89676bce6d8be44c869226ab14 100755 (executable)
@@ -752,6 +752,7 @@ sub file_declares_8bit_cte {
                print "    $f\n";
        }
        $auto_8bit_encoding = ask("Which 8bit encoding should I declare [UTF-8]? ",
+                                 valid_re => qr/.{4}/, confirm_only => 1,
                                  default => "UTF-8");
 }