From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-5.5 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 31BBE20986 for ; Tue, 27 Sep 2016 20:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934047AbcI0U70 (ORCPT ); Tue, 27 Sep 2016 16:59:26 -0400 Received: from mout.web.de ([212.227.17.11]:57812 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752586AbcI0U7W (ORCPT ); Tue, 27 Sep 2016 16:59:22 -0400 Received: from [192.168.178.36] ([79.213.113.239]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MgwdY-1bbhnx37Q0-00M10O; Tue, 27 Sep 2016 22:59:09 +0200 Subject: Re: [PATCH 2/2] use strbuf_add_unique_abbrev() for adding short hashes, part 2 To: Junio C Hamano References: <29e75b7b-6dd0-8c52-e444-cad1ba613cd0@web.de> Cc: Git List From: =?UTF-8?Q?Ren=c3=a9_Scharfe?= Message-ID: <3c80f7d7-a145-3a4a-4bf2-2d8fb6dda04b@web.de> Date: Tue, 27 Sep 2016 22:59:03 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:1iVY0Itw5GNne6/xT10q8JFvQDWZC6IB2As288lm+r+SSACrs0l 2URZMYC7mq8ejDNcFpMnfMO4c9CstLh3UKC5fgPMbj9iqQZewwVpOjg9gE+UJDtpXurioFB LrIC8EOqJBfa2dpk7QNJosRZYm7PYKCcCBh0/4TKCCbmiFuUju67eJmyELGbdN16RonsyEg Si4OOfoIBZReTLb5c8KTw== X-UI-Out-Filterresults: notjunk:1;V01:K0:AH9hcwmggns=:0aUYr8QzJuyFM9TAumv0eK L1q4v6D748Yoo3jC90mqMo1RSQiIaSBxOFnflRctKu8hq3gTbnyJEjtOJLbcIALHvu0Iiaunk yr/E8zyflnpiwD7qWHIFB/f699Olnlf5dZiGmmhTBH3xohZyYbLL9sHYZ1pPaGj+HzSa0k9WW L0KAEdFzdRVVkl+5FfjImFDgpZiCNDPXy9+stzaQC34rk5AX/tpy5or45ZREyta9A+oPPvh5y gpBlOvtPtDz9HtWoONt/6Qressj7eXnLZ8dmPmPhcafCWmvCRC8srlakQBrt3jYRssE6jZzAK 2HmbmSjy4ZNc4VRTybAVYznj1diW7HKiJbx3TQID0wX+o+efvT9ZZUMHAsAPvClaoad9//z5w Vbi54xpSrUxvsT5zQ33NSFZawp80h2tJZZPLnzoPTB1EDGgcJKlr+yRvhaxZjV3Fbxd0OPoUk 9SUUiZsJ6Pl/Kkn4z2XnMfZ9kZr13FJ6D0kpppILtNzp6beWwhlO/q8RnrWYd+jTgbYZ4FiOS daHzCnmLVHmK/7Odg8Uxx9M9v295/JsSf4tecnzXvxiNlWYO/aTXkBQi8V3DZFqzsxBE5pYg4 xMUO/U9e9kKJEhUQWVkmgul+tc1mdU4MPvURUKyq/7Vm0aX2DynlLMJfjKDkHeVgUcYivda84 W4SG9F97ruPzh52eX7ZGA7mpHNdt3hCEI73YZaf89LpErQbWZZWOMHiwf8NC3rHvf/51XrBlJ BdlJ+jNFqyWieFgSTbwr22dtThJqmKsZD4s3hE8K9/q/kd2Q7tfm/k4VqQ0QJoJXQ0V4hE7vV 3XjkCnx Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Am 27.09.2016 um 22:28 schrieb Junio C Hamano: > René Scharfe writes: >> diff --git a/submodule.c b/submodule.c >> index dcc5ce3..8cf40ea 100644 >> --- a/submodule.c >> +++ b/submodule.c >> @@ -396,7 +396,7 @@ static void show_submodule_header(FILE *f, const char *path, >> find_unique_abbrev(one->hash, DEFAULT_ABBREV)); >> if (!fast_backward && !fast_forward) >> strbuf_addch(&sb, '.'); >> - strbuf_addstr(&sb, find_unique_abbrev(two->hash, DEFAULT_ABBREV)); >> + strbuf_add_unique_abbrev(&sb->hash, two, DEFAULT_ABBREV); > > I wonder how could this change come out of this definition: > > @@ > expression E1, E2, E3; > @@ > - strbuf_addstr(E1, find_unique_abbrev(E2, E3)); > + strbuf_add_unique_abbrev(E1, E2, E3); Impossible. I added "->hash" manually during a rebase (merging a0d12c44, wrongly). Good catch, thanks! Seeing proof of skipping compile-testing I wonder what else I do forget in my daily life. :-| I'll better go to sleep now.. Fixup patch, generated by reverting the diff, re-adding the semantic patch and using coccicheck; compiles and survives make test: --- submodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodule.c b/submodule.c index 8cf40ea..bb06b60 100644 --- a/submodule.c +++ b/submodule.c @@ -396,7 +396,7 @@ static void show_submodule_header(FILE *f, const char *path, find_unique_abbrev(one->hash, DEFAULT_ABBREV)); if (!fast_backward && !fast_forward) strbuf_addch(&sb, '.'); - strbuf_add_unique_abbrev(&sb->hash, two, DEFAULT_ABBREV); + strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV); if (message) strbuf_addf(&sb, " %s%s\n", message, reset); else -- 2.10.0