From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3211AC7618E for ; Mon, 24 Apr 2023 16:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbjDXQFz (ORCPT ); Mon, 24 Apr 2023 12:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231625AbjDXQFy (ORCPT ); Mon, 24 Apr 2023 12:05:54 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 698CE5FE4 for ; Mon, 24 Apr 2023 09:05:53 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-63b4a64c72bso3781758b3a.0 for ; Mon, 24 Apr 2023 09:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682352353; x=1684944353; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=1CvZ2QldYyTkkWx9jRSazrusB5WwF3WIxPerKea5Ngc=; b=smGMbbA6XS/RLnSa0XyZDcEQSw5T7adpTDAHupLktoI9CihA5f/5r8rSjSeNRR6Hyd Bmxn0/XNdu0yqJZQcUEom1daS86idsvUpDzsrRbTgpimS4f0i365/4cY8AQ5OKrPQhh5 WZ1fuD5MNmgB9ZfB9KrivDBI+Q3HVELuOll4t+wpzPOvFAKSkRleu9U1mV9IwpuBuPod xeCUaTtv3NfZlYAOqG+JeuwE9BNSQ5Nl1lSkTSzAylBRmsnkN+wGY2cZwNCASQ9xa77z 9765u7bclsm/h28cNhaiZ8YbRoI18IpsEHuNq8JJ4s59LPcmOpDGUVGDA/2ZJMeJ4jPd xnCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682352353; x=1684944353; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:sender:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=1CvZ2QldYyTkkWx9jRSazrusB5WwF3WIxPerKea5Ngc=; b=fWTwyfzWqrnZI8IDQKtsXHY4jbYuyTYXNLYpKEmadACQMvMn/3yaH4wrmnrnWoG/Vk DaHDbrpeIKI4Ipoh497XH8mupelQFQVLykHWNIlJTFhuX+IWOOFQmg2mtNroHHC2ljhJ juhZgtSslSRA3OXbV/N4kMz+fe3LHjXr0qib5ei0pO5p9b74Kt61EsYUAt90wtEREQL3 ws5Njb8SjYiHHtfCLJdm8qa4IcL7csbhWnU8OOw9F4XDoimJwuJpeLcfeJdzPDvlKKjw 0iGOS8h3nhKt3+9GCPBe3Lthz8rrdncndFu3iqwRjykzzj/pYFZcb9qcJgHEEDa5QzzY 8mOw== X-Gm-Message-State: AAQBX9f/uaHsaExZCAf4PrVYEu9s/GoE/3CwTmysdbZFmOzmHADpJ+y4 O82abIfKvvqvOIkxwgsNhWk= X-Google-Smtp-Source: AKy350a6W3wwAKt7oF9KTqrs7YaZ3PYcVerC2aVfh7jJOPNQMndoGLDjba2tBF8PIpG5dr9eZdEpnw== X-Received: by 2002:a05:6a00:1397:b0:634:db05:d477 with SMTP id t23-20020a056a00139700b00634db05d477mr10671185pfg.10.1682352352755; Mon, 24 Apr 2023 09:05:52 -0700 (PDT) Received: from localhost (187.137.203.35.bc.googleusercontent.com. [35.203.137.187]) by smtp.gmail.com with ESMTPSA id f9-20020a056a001ac900b00640d80c8a2bsm1623142pfv.50.2023.04.24.09.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 09:05:52 -0700 (PDT) Sender: Junio C Hamano From: Junio C Hamano To: Jacob Keller Cc: , Jacob Keller , Glen Choo Subject: Re: [PATCH] blame: use different author name for fake commit generated by --contents References: <20230421223013.467142-1-jacob.e.keller@intel.com> <019057ab-c917-80cd-063b-4871e47dc382@intel.com> Date: Mon, 24 Apr 2023 09:05:52 -0700 In-Reply-To: <019057ab-c917-80cd-063b-4871e47dc382@intel.com> (Jacob Keller's message of "Fri, 21 Apr 2023 17:11:54 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jacob Keller writes: >> test_expect_success 'blame working copy' ' >> test_when_finished "git restore file" && >> - echo "1A quick brown fox jumps over" >file && >> - echo "another lazy dog" >> file && >> + echo "11A quick brown fox jumps over the" >file && >> + echo "lazy dog" >>file && > > I think the right fix for this test is to keep the first line (1A) the > same, and include the missing "the" I had removed before, and keep the > 2nd line as the changed line with "another lazy dog". Either is fine as long as one line is left intact and the other line is modified, as the end result we want is for one to be attributed to the floating change while the other one to be attributed to the HEAD. > > Will fix in v2, and double check the tests. Thanks. > I had run them but my local > system sometimes fails the following test: Hmph, I do not recall seeing t5551 fail but we had seen a fair number of flaky http tests, and I would not be surprised if there were still remaining flaky tests there. > >> not ok 46 - passing hostname resolution information works >> # >> # BOGUS_HOST=gitbogusexamplehost.invalid && >> # BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT && >> # test_must_fail git ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null && >> # git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null >> # > > I had thought this was the only failure, and that it has something to do > with my system configuration (possibly proxy settings) which affect > this.. I checked the firewall configuration and it doesn't appear to be > that... > > It would be nice to figure out what makes it so the tests fail so that I > can make sure tests properly pass on my submissions before sending them > in the future. > > Thanks, > Jake > > >> check_count A 1 "Not Committed Yet" 1 >> ' >> >> >>