Git fork

Merge branch 'jt/imap-send-message-fix'

Update some error messages from "git imap-send".

* jt/imap-send-message-fix:
imap-send: improve error messages with configuration hints
imap-send: fix confusing 'store' terminology in error message

+7 -2
+7 -2
imap-send.c
··· 25 25 #define DISABLE_SIGN_COMPARE_WARNINGS 26 26 27 27 #include "git-compat-util.h" 28 + #include "advice.h" 28 29 #include "config.h" 29 30 #include "credential.h" 30 31 #include "gettext.h" ··· 1804 1805 1805 1806 if (!server.host) { 1806 1807 if (!server.tunnel) { 1807 - fprintf(stderr, "no IMAP host specified\n"); 1808 + error(_("no IMAP host specified")); 1809 + advise(_("set the IMAP host with 'git config imap.host <host>'.\n" 1810 + "(e.g., 'git config imap.host imaps://imap.example.com')")); 1808 1811 ret = 1; 1809 1812 goto out; 1810 1813 } ··· 1824 1827 } 1825 1828 1826 1829 if (!server.folder) { 1827 - fprintf(stderr, "no IMAP store specified\n"); 1830 + error(_("no IMAP folder specified")); 1831 + advise(_("set the target folder with 'git config imap.folder <folder>'.\n" 1832 + "(e.g., 'git config imap.folder Drafts')")); 1828 1833 ret = 1; 1829 1834 goto out; 1830 1835 }