From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 02/17] revert: Inline add_message_to_msg function Date: Mon, 11 Jul 2011 14:53:53 +0000 Message-ID: <1310396048-24925-3-git-send-email-artagnon@gmail.com> References: <1310396048-24925-1-git-send-email-artagnon@gmail.com> Cc: Jonathan Nieder , Junio C Hamano , Christian Couder , Daniel Barkalow To: Git List X-From: git-owner@vger.kernel.org Mon Jul 11 16:54:38 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QgHsc-0005F4-FD for gcvg-git-2@lo.gmane.org; Mon, 11 Jul 2011 16:54:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757776Ab1GKOyS (ORCPT ); Mon, 11 Jul 2011 10:54:18 -0400 Received: from mail-vx0-f174.google.com ([209.85.220.174]:46637 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757726Ab1GKOyP (ORCPT ); Mon, 11 Jul 2011 10:54:15 -0400 Received: by mail-vx0-f174.google.com with SMTP id 39so2716724vxb.19 for ; Mon, 11 Jul 2011 07:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=5XZDKLXSflhHHTyE/Bsmg8i/Y0BtOur0LYLIo1jAtDU=; b=XHsWgFMcT673x7aIOKM+KaBfNTZGx2tNJNZ4QluIt09jZROUNOSG0g8XG1H/LsbtbW j5traC2I6+lIZxWvt3RaPPJA0VqoGlooPDPJuE9l5CUc2plrcDBKJ5bL0C1e0LQTdySa 6vvB1OzrDEZezhkHwdBC/PFlMxT4VD01YzdIE= Received: by 10.52.108.71 with SMTP id hi7mr2346903vdb.324.1310396055454; Mon, 11 Jul 2011 07:54:15 -0700 (PDT) Received: from localhost.localdomain (ec2-184-72-137-52.compute-1.amazonaws.com [184.72.137.52]) by mx.google.com with ESMTPS id b9sm4510527vdk.25.2011.07.11.07.54.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jul 2011 07:54:14 -0700 (PDT) X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1310396048-24925-1-git-send-email-artagnon@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The add_message_to_msg function is poorly implemented, has an unclear API, and only one callsite. Replace the callsite with a cleaner implementation. Additionally, fix a bug introduced in 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) -- a NULL pointer was being incremented when "\n\n" was not found in "message". Helped-by: Junio C Hamano Signed-off-by: Ramkumar Ramachandra --- builtin/revert.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 2df3f3b..f88e007 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -185,19 +185,6 @@ static char *get_encoding(const char *message) return NULL; } -static void add_message_to_msg(struct strbuf *msgbuf, const char *message) -{ - const char *p = message; - while (*p && (*p != '\n' || p[1] != '\n')) - p++; - - if (!*p) - strbuf_addstr(msgbuf, sha1_to_hex(commit->object.sha1)); - - p += 2; - strbuf_addstr(msgbuf, p); -} - static void write_cherry_pick_head(void) { int fd; @@ -462,11 +449,16 @@ static int do_pick_commit(void) } strbuf_addstr(&msgbuf, ".\n"); } else { + const char *p = strstr(msg.message, "\n\n"); + base = parent; base_label = msg.parent_label; next = commit; next_label = msg.label; - add_message_to_msg(&msgbuf, msg.message); + + p = p ? p + 2 : sha1_to_hex(commit->object.sha1); + strbuf_addstr(&msgbuf, p); + if (no_replay) { strbuf_addstr(&msgbuf, "(cherry picked from commit "); strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); -- 1.7.5.GIT