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 A4517C7618E for ; Mon, 24 Apr 2023 18:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231459AbjDXSAA (ORCPT ); Mon, 24 Apr 2023 14:00:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjDXR76 (ORCPT ); Mon, 24 Apr 2023 13:59:58 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7C1E6A78 for ; Mon, 24 Apr 2023 10:59:55 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-63b79d8043eso25180462b3a.0 for ; Mon, 24 Apr 2023 10:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682359195; x=1684951195; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=INx66fAOcFnLGZh+gd8G1pLdr14RKNSts/uNRr8qs1c=; b=mhKnibuF/IYxQATqR9dagbldctgBnAb8BBByUAl64KgP5FkuoyUd21fKwbj4sL+ZTS 7MtHg7WQ0vO6ZW6OAuJ5AEVvp+bOO/ozrP7lyJpYDR2MozLtMJaDWAsrXfNh4zcOQ+UO k/jdR9rG9iX0oxm4FJUwAv3ZXgAIkuOulb70PSrhrpdvbMqPT3LzDsm3j3ggSl/fLM0I T2ClZ7+oglchDuJ8jkrz6srY4DsTDCphc7HHFTeR0XpngWjFXOKjmIlrDJc3Ft6EPZC6 a3V44YZLaq5zkCDtJ5MobKUkJIjBvRbEUnn4YWWJ4gGEIpTcuRjD4TAKoDgcX9cblkQP 9qZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682359195; x=1684951195; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=INx66fAOcFnLGZh+gd8G1pLdr14RKNSts/uNRr8qs1c=; b=Jc5Hf3ZLlA9yQofFTyrQ+aWaaaK6F4UenucFbrrfxELet8t3qj5Sxd0w1PZaTOjsmb RBnbWp6kWoHW9YyfXbPSnoxMw3pe9uSoPK0el1bt4COYV/E8EqJAzHnqI3rSdHwSQPSq YIE3tvSak0du0JWIMKLF7f4y4HWopz+Vbx7Cw/jLZecmZM5ewY41l4z3d53UF2xfQNwI 5vBzOrmpmDz/91HP+kJxFEbWSCmUpNWCpGrMDU4PSwIt2KMuBJp/jDshyuywco3P1oov McgkRwaLq/4lu5FuIOyV0+k7WAvrTlkIMuL3ODMtKI5Gt5nk7H2IemMJtanmx2MhZi7L fXtg== X-Gm-Message-State: AAQBX9d9VdXUT1TUNVajuCbIUPdq6j5JUZGIz08TwP3jqOlarpJjGYza 25dUElEUCksk03L3su0wZR77V+mA5i8iEQ== X-Google-Smtp-Source: AKy350Ye9bNlGnYKxDt/1Ne4Upqy75ajSiHv9DIJS+uHM25iKyTxtvtearJreWuCZDYf6AH/nYfiY86ufWTOQQ== X-Received: from chooglen.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3a07]) (user=chooglen job=sendgmr) by 2002:a05:6a00:15d5:b0:63b:8571:8109 with SMTP id o21-20020a056a0015d500b0063b85718109mr6467747pfu.3.1682359195273; Mon, 24 Apr 2023 10:59:55 -0700 (PDT) Date: Mon, 24 Apr 2023 10:59:53 -0700 In-Reply-To: <019057ab-c917-80cd-063b-4871e47dc382@intel.com> Mime-Version: 1.0 References: <20230421223013.467142-1-jacob.e.keller@intel.com> <019057ab-c917-80cd-063b-4871e47dc382@intel.com> Message-ID: Subject: Re: [PATCH] blame: use different author name for fake commit generated by --contents From: Glen Choo To: Jacob Keller , Junio C Hamano Cc: git@vger.kernel.org, Jacob Keller Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jacob Keller writes: >> diff --git c/t/annotate-tests.sh w/t/annotate-tests.sh >> index 859693949b..4238ce45f8 100644 >> --- c/t/annotate-tests.sh >> +++ w/t/annotate-tests.sh >> @@ -74,8 +74,8 @@ test_expect_success 'blame 1 author' ' >> >> 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". This sounds right to me; it's easier to read when the working copy test and the --contents test use the same data > >> 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. I remember seeing a similar, flaky failure on an older version of master (~2-3 months ago). But if you based this on a recent version, I'm afraid I haven't seen this :/