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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 358651F463 for ; Wed, 25 Sep 2019 12:45:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405597AbfIYMp1 (ORCPT ); Wed, 25 Sep 2019 08:45:27 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39832 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726369AbfIYMp1 (ORCPT ); Wed, 25 Sep 2019 08:45:27 -0400 Received: by mail-wr1-f66.google.com with SMTP id r3so6778416wrj.6 for ; Wed, 25 Sep 2019 05:45:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:from:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=759q2NBP2SW2C8AglZQw7/gWVmb5KcuficaXX5sy+ho=; b=BHzb6YHVwG6SqOTSmt6lNbH/t7YeE4dd1SDt+kdvzrq64NACraCJY3ZrGpUl8J30ms XX1YCJvWTqiexP4GWXEIeuxdnOkiasr2FFcat0jnrBE+PirFa8mjNigT5kwv6u3BdUqW WdsXM7jUlkLp68ueNvFffhw6sewuuVhzEfqQmrdEBRk0LrRPxURqqSj4rv45c9JgiK8i dnFpZ14vyMhUocL3nahRicnAqLOKoV+ok1hgj4c+cnSYQKxihICMOYKzhWr9HpcEd3Li 5eI+kcu4bho8wgbtOA+jOBlHqOQQ3qWd7apEFWUcGfm26/Hqa38yie9WbGE6gdDP48Hj JevQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=759q2NBP2SW2C8AglZQw7/gWVmb5KcuficaXX5sy+ho=; b=PVXKQk3C9QXAgtzD+olZCvyxQ9OYvLDRlxSGD7hl4lsN0QX4gdc9RTBOqcQ43+XwpG vV2VTXrNizv2/QTuNADnzzbCjvKFbm8nPDSfgBLDKjr3YL6KHraMs9M6lAt62iwd5iJO TbE8H+2r9QU3vKotlbEWsIUXvnURHuNoFSGewoXHTyObsBV1bYSTWsGxd5M9x5FXOJZY BBN3CW/xJU6Lrcx5l68VrX/0YV4jgiQO7+SuRAfz36wseU7RoRL+iEPFtT/n1p8QIFoL o2kiZhon07jyv2RZhFhjrMgHR+guEDiynX1BhCdQgPruT6JefletdD3xZsLHElRrUURq jiEw== X-Gm-Message-State: APjAAAW9ZoyedNjdScBEJVsfPWo/FQNcuwEXEDF9TbVdwvbaRTIbhnAU 1dIMbBvB0+OLDU09qEFgC/tu6bfV X-Google-Smtp-Source: APXvYqz5bOUPPejRNbCM7FiOooULDlMzDOy2GENwRPFsmJsXhgBPd0ObYbzutontJ9oHng6SUHDYpA== X-Received: by 2002:a5d:4041:: with SMTP id w1mr9126183wrp.313.1569415523719; Wed, 25 Sep 2019 05:45:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g24sm6686248wrb.35.2019.09.25.05.45.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Sep 2019 05:45:23 -0700 (PDT) Date: Wed, 25 Sep 2019 05:45:23 -0700 (PDT) X-Google-Original-Date: Wed, 25 Sep 2019 12:45:21 GMT Message-Id: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 0/1] stash apply: be prepared to run in a worktree's subdirectory Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org I saw this issue a couple times in my setup, and always wondered why nobody else seemed to be hit by this. When I finally found/made some time to investigate, I found out that it really requires a specific setup: I have many worktrees connected to my main git.git clone, often run inside t/ and I do stash quite often (now that git stash's performance is a joy on Windows). Johannes Schindelin (1): stash apply: report status correctly even in a worktree's subdirectory builtin/stash.c | 2 ++ t/t3908-stash-in-worktree.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100755 t/t3908-stash-in-worktree.sh base-commit: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-354%2Fdscho%2Fapply-stash-in-subdirectory-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-354/dscho/apply-stash-in-subdirectory-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/354 -- gitgitgadget