X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/901288c20717c357bfd7b640fbd2e3d24d4b636b..b4f656f00412360441dfe7e41c9733a9ca547015:/stgit/commands/mail.py

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 176d7a2..fe44bc9 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -127,14 +127,18 @@ def __get_sender():
     configuration file
     """
     if config.has_option('stgit', 'sender'):
-        return config.get('stgit', 'sender')
-    elif config.has_option('stgit', 'authname') \
-             and config.has_option('stgit', 'authemail'):
-        return '%s <%s>' % (config.get('stgit', 'authname'),
-                            config.get('stgit', 'authemail'))
+        sender = config.get('stgit', 'sender')
     else:
+        try:
+            sender = str(git.user())
+        except git.GitException:
+            sender = str(git.author())
+
+    if not sender:
         raise CmdException, 'unknown sender details'
 
+    return sender
+
 def __parse_addresses(addresses):
     """Return a two elements tuple: (from, [to])
     """
@@ -476,7 +480,8 @@ def func(parser, options, args):
     if options.all:
         patches = applied
     elif len(args) >= 1:
-        patches = parse_patches(args, applied)
+        unapplied = crt_series.get_unapplied()
+        patches = parse_patches(args, applied + unapplied, len(applied))
     else:
         raise CmdException, 'Incorrect options. Unknown patches to send'