From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 72A7C1F5AE for ; Wed, 9 Jun 2021 19:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229557AbhFITpQ (ORCPT ); Wed, 9 Jun 2021 15:45:16 -0400 Received: from mail-ed1-f41.google.com ([209.85.208.41]:35706 "EHLO mail-ed1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbhFITpQ (ORCPT ); Wed, 9 Jun 2021 15:45:16 -0400 Received: by mail-ed1-f41.google.com with SMTP id ba2so28143149edb.2 for ; Wed, 09 Jun 2021 12:43:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ySn53IDzTnwy4+0kv+PZfXaJZACoVqlsjneVJK7PFF4=; b=kMYVq7KY/RL+/wfAtwRO9bg31stbzQ/LdopN3DENcpdoIo3NmM5gNJCPbiUfddLe5R 4by0dgbdvdG+txfGbNdAps4XTtW+y6G8Qnqjo3tVdWXRjR/bNte+LvPFAIyAk9tMA16Y iwETjnEp32Y2C62NkZK+g370Fff/HgYyFb58HAc5xfN9WDKH+XenrR5L0Mygb6+ptubZ wmRDjlQeI6Hv6IMLivkdk5JbrCBhW4A1GZl0n1i/5AhxmaqOPpsmA/vgCw/mm21hENdo 0mBqYOHyKj7/lfUCVZ0FMS/N/MpqabI5Q2Gf0aqowY0ED+Iuw5yWf1q0spBVMblX108d 6pIA== X-Gm-Message-State: AOAM532qDGc1eQ0U0ke0vAdPDeGVWUVmk/Fy6ZxwLiAo5jctnH4nYpYy 3GPbFvDSJL+zuepSFkosXMO4UR2JzzaE7U9Tg7c= X-Google-Smtp-Source: ABdhPJwB/vgas8g0+gWJsWqGZXjsWkRkbpzIXO94ybYlWaaIeo0GfWJVcGSijEqno2GcS03fpizFpRZfATLSVEOuBIo= X-Received: by 2002:a05:6402:1777:: with SMTP id da23mr983775edb.181.1623267784993; Wed, 09 Jun 2021 12:43:04 -0700 (PDT) MIME-Version: 1.0 References: <20210609192842.696646-1-felipe.contreras@gmail.com> <20210609192842.696646-2-felipe.contreras@gmail.com> In-Reply-To: <20210609192842.696646-2-felipe.contreras@gmail.com> From: Eric Sunshine Date: Wed, 9 Jun 2021 15:42:54 -0400 Message-ID: Subject: Re: [PATCH 1/7] test: add merge style config test To: Felipe Contreras Cc: Git List , David Aguilar , Junio C Hamano , Sergey Organov , Bagas Sanjaya , Elijah Newren , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Denton Liu Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Jun 9, 2021 at 3:29 PM Felipe Contreras wrote: > We want to test different combinations of merge.conflictstyle, and a new > file is the best place to do that. > > Signed-off-by: Felipe Contreras > --- > diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh > @@ -0,0 +1,44 @@ > +fill () { > + for i > + do > + echo "$i" > + done > +} This seems to duplicate the behavior of test_write_lines()... > +test_expect_success 'merge' ' > + test_create_repo merge && > + ( > + cd merge && > + fill 1 2 3 >content && ... which could be used here instead: test_write_lines 1 2 3 >content &&