From mboxrd@z Thu Jan 1 00:00:00 1970 From: Remi Lespinet Subject: [PATCH v5 05/10] send-email: Allow use of aliases in the From field of --compose mode Date: Sun, 21 Jun 2015 01:17:48 +0200 Message-ID: <1434842273-30945-5-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> References: <1434550720-24130-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> <1434842273-30945-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> Cc: Remi Galan , Remi Lespinet , Guillaume Pages , Louis-Alexandre Stuber , Antoine Delaite , Matthieu Moy To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jun 21 01:18:30 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z6S1q-0007nJ-Rp for gcvg-git-2@plane.gmane.org; Sun, 21 Jun 2015 01:18:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932507AbbFTXSL (ORCPT ); Sat, 20 Jun 2015 19:18:11 -0400 Received: from zm-etu-ensimag-2.grenet.fr ([130.190.244.118]:58918 "EHLO zm-etu-ensimag-2.grenet.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751267AbbFTXR6 (ORCPT ); Sat, 20 Jun 2015 19:17:58 -0400 Received: from localhost (localhost [127.0.0.1]) by zm-smtpout-2.grenet.fr (Postfix) with ESMTP id 315A928E0; Sun, 21 Jun 2015 01:17:57 +0200 (CEST) Received: from zm-smtpout-2.grenet.fr ([127.0.0.1]) by localhost (zm-smtpout-2.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YFrS+IUaBzt2; Sun, 21 Jun 2015 01:17:57 +0200 (CEST) Received: from zm-smtpauth-1.grenet.fr (zm-smtpauth-1.grenet.fr [130.190.244.122]) by zm-smtpout-2.grenet.fr (Postfix) with ESMTP id 140E92891; Sun, 21 Jun 2015 01:17:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zm-smtpauth-1.grenet.fr (Postfix) with ESMTP id 1022D20D9; Sun, 21 Jun 2015 01:17:57 +0200 (CEST) Received: from zm-smtpauth-1.grenet.fr ([127.0.0.1]) by localhost (zm-smtpauth-1.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RGaGxJEENiPN; Sun, 21 Jun 2015 01:17:57 +0200 (CEST) Received: from localhost.localdomain (cor91-7-83-156-199-91.fbx.proxad.net [83.156.199.91]) by zm-smtpauth-1.grenet.fr (Postfix) with ESMTPSA id 9E42420D6; Sun, 21 Jun 2015 01:17:56 +0200 (CEST) X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434842273-30945-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Aliases were expanded before considering the From field of the --compose option. This is inconsistent with other fields (To, Cc, ...) which already support aliases. Signed-off-by: Remi Lespinet --- git-send-email.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 2d5c530..f61449d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -555,8 +555,6 @@ if (@alias_files and $aliasfiletype and defined $parse_alias{$aliasfiletype}) { } } -($sender) = expand_aliases($sender) if defined $sender; - # is_format_patch_arg($f) returns 0 if $f names a patch, or 1 if # $f is a revision list specification to be passed to format-patch. sub is_format_patch_arg { @@ -801,6 +799,8 @@ if (!$force) { } } +($sender) = expand_aliases($sender) if defined $sender; + if (!defined $sender) { $sender = $repoauthor || $repocommitter || ''; } -- 1.9.1