Rewrite git-fetch-email with git rev-parse --parseopt

Adds long options, -u/--user, -a/--apply to automatically pipe to
git-am.

1 files changed, 37 insertions, 16 deletions

diff --git a/git-fetch-email.1 b/git-fetch-email.1
index 8ee6508..97a1194 100644
--- a/git-fetch-email.1
+++ b/git-fetch-email.1
@@ -9,6 +9,7 @@
 .Sh SYNOPSIS
 .Nm git
 .Cm fetch-email
+.Op Fl av
 .Op Fl C Ar cc
 .Op Fl F Ar from
 .Op Fl S Ar subject
@@ -16,7 +17,11 @@
 .Op Fl h Ar host
 .Op Fl m Ar mailbox
 .Op Fl p Ar port
-.Op Ar user
+.Op Fl u Ar user
+.Oo
+.Fl Fl
+.Ar args ...
+.Oc
 .
 .Sh DESCRIPTION
 The
@@ -27,27 +32,27 @@ using
 .Xr git-config 1
 and
 .Xr git-credential 1 .
-It fetches patches to be piped into
+It fetches patches to be applied with
 .Xr git-am 1 .
 .
 .Pp
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl C Ar cc
+.It Fl C Ar cc , Fl Fl cc Ns = Ns Ar cc , Fl Fl no-cc
 Fetch patches with matching
 .Cm Cc
 headers.
 The default is the value of
 .Cm fetchemail.cc .
 .
-.It Fl F Ar from
+.It Fl F Ar from , Fl Fl from Ns = Ns Ar from , Fl Fl no-from
 Fetch patches with matching
 .Cm From
 headers.
 The default is the value of
 .Cm fetchemail.from .
 .
-.It Fl S Ar subject
+.It Fl S Ar subject, Fl Fl subject Ns = Ns Ar subject , Fl Fl no-subject
 Fetch patches with matching
 .Cm Subject
 headers.
@@ -56,14 +61,26 @@ The default is the value of
 or
 .Ql [PATCH .
 .
-.It Fl T Ar to
+.It Fl T Ar to , Fl Fl to Ns = Ns Ar to , Fl Fl no-to
 Fetch patches with matching
 .Cm To
 headers.
 The default is the value of
 .Cm fetchemail.to .
 .
-.It Fl h Ar host
+.It Fl a , Fl Fl Oo no- Oc Ns apply
+Apply patches with
+.Xr git-am 1 .
+The arguments
+.Fl Fl patch-format Ns = Ns mboxrd
+are passed to
+.Xr git-am 1
+along with any arguments following
+.Ql Fl Fl
+passed to
+.Nm .
+.
+.It Fl h Ar host , Fl Fl host Ns = Ns Ar host
 Connect to IMAP on
 .Ar host .
 The default is the value of
@@ -71,30 +88,33 @@ The default is the value of
 or as inferred by
 .Xr imbox 1 .
 .
-.It Fl m Ar mailbox
+.It Fl m Ar mailbox , Fl Fl mailbox Ns = Ns Ar mailbox
 Fetch patches from
 .Ar mailbox .
 The default is the value of
 .Cm fetchemail.imapMailbox ,
 or INBOX.
 .
-.It Fl p Ar port
+.It Fl p Ar port , Fl Fl port Ns = Ns Ar port
 Connect to IMAP on
 .Ar port .
 The default is the value of
 .Cm fetchemail.imapServerPort ,
 or as inferred by
 .Xr imbox 1 .
+.
+.It Fl u Ar user , Fl Fl user Ns = Ns Ar user
+Log in to IMAP as
+.Ar user .
+The default is the value of
+.Cm fetchemail.imapUser .
+.
+.It Fl v , Fl Fl Oo no- Oc Ns verbose
+Log IMAP protocl to standard error.
 .El
 .
 .Pp
 If
-.Ar user
-is not provided,
-the value of
-.Cm fetchemail.imapUser
-is used.
-If
 .Cm fetchemail.imapPass
 is set,
 it is used as the IMAP login password,
@@ -103,8 +123,9 @@ otherwise the password is obtained using
 .
 .Sh EXAMPLES
 .Bd -literal
+git config fetchemail.imapUser june@causal.agency
 git config fetchemail.to list+imbox@causal.agency
-git fetch-email june@causal.agency | git am
+git fetch-email --apply
 .Ed
 .
 .Sh SEE ALSO