From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 7021920189 for ; Sun, 19 Jun 2016 18:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751310AbcFSSyF (ORCPT ); Sun, 19 Jun 2016 14:54:05 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37177 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbcFSSyD (ORCPT ); Sun, 19 Jun 2016 14:54:03 -0400 Received: by mail-wm0-f50.google.com with SMTP id a66so51255378wme.0 for ; Sun, 19 Jun 2016 11:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=AI9IiW1njF4pzl3CyupfU1a/UNyQzA+5hanpzJX1K+0=; b=1Jq9LQBMQVwwty41on9FeHkvx8x7ESCBT6t/qVGmxXgYrAWKJCU6gb3nTFum18SCRc OuiqVNQKyOko/BOn8olc9Gb3+9oFyGfHZqiJqt49wrxDPli1vSkeQO7zIJz3CtIkmVRW jb51iE/g4jVCN+39caPR9JxuGRe18/hAzh5GY+7BGdwKUWeUe8Fua35JQLYNL8zQVy5Z nP2GzU0xaLtMamW/qyaDajXWWfX8ZCRhi+3zkQ2goShsJEgpdd5KCqOPXDA1qgS6AfDa Ast3fJtEex65TXgJE0B7y/fs9aPh2aoM9DqnQfGygt1EhphdRKH8OKRV7rJ5/Bf4NtLw kdkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=AI9IiW1njF4pzl3CyupfU1a/UNyQzA+5hanpzJX1K+0=; b=Rs1vL8/n8Ijv/q1vYHBL+OtucCoX14a+LECKiwg9j1YVURF7JvJot8BYoJpXd3pdaC XrFbg2U30bKwktZq4R189AUL/J8q4sCG5pUGjtg94Cdd6hsmPHvWAqk/wBR0c2EYpXTN nx8CgLTwIEjB+RtBS7ycG2O01F1Lj9EHuSsp66sYdNYYpPLcGSAW5+tJrXxs959RrA/T 6WJ4j02FQcp/zZ3plggYbO7HBg+Vo+rKoNbawUL0RyGNx7vSAeL86m95AxbnUQm0xfY0 FxOL66b99rm034xdt34cefvgqnRW4WfDl5F/QiK7QFU2tJGN0i+4EO8Wz6AxY55SwnQ+ 9XaQ== X-Gm-Message-State: ALyK8tKySVPdnYEf2tGz6DDY/swBZ6hIH3ORTBGWtu9OQ4rG5LVQvVoV9orZsJoVaoT77w== X-Received: by 10.28.158.132 with SMTP id h126mr7254023wme.43.1466362441735; Sun, 19 Jun 2016 11:54:01 -0700 (PDT) Received: from neu4sfhg12.ads.autodesk.com (adsknateur.autodesk.com. [132.188.32.100]) by smtp.gmail.com with ESMTPSA id a4sm37058968wjq.40.2016.06.19.11.54.00 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 11:54:01 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: What's cooking in git.git (Jun 2016, #05; Thu, 16) From: Lars Schneider In-Reply-To: Date: Sun, 19 Jun 2016 20:53:59 +0200 Cc: Michael Haggerty , Git Mailing List , Luke Diamand Content-Transfer-Encoding: 7bit Message-Id: References: <1634E84E-5260-4F7B-A74F-AF5D3A7C0181@gmail.com> <576650E7.70107@alum.mit.edu> <3E132EEE-CEBA-4C0D-A5C4-62F587A02225@gmail.com> To: Junio C Hamano X-Mailer: Apple Mail (2.3124) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org > On 19 Jun 2016, at 20:49, Lars Schneider wrote: > > >> On 19 Jun 2016, at 20:13, Junio C Hamano wrote: >> >> Lars Schneider writes: >> >>> This seems to fix the issue: >>> >>> --- a/git-p4.py >>> +++ b/git-p4.py >>> @@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap): >>> self.useClientSpec_from_options = False >>> self.clientSpecDirs = None >>> self.tempBranches = [] >>> - self.tempBranchLocation = "git-p4-tmp" >>> + self.tempBranchLocation = "refs/heads/git-p4-tmp" >>> self.largeFileSystem = None >>> >>> if gitConfig('git-p4.largeFileSystem'): >> >> Anywhere in refs/ would be OK, but don't you need to adjust the >> test, too? >> >> Even though I do not use git-p4, I'd imagine that I would be upset >> if temporary refs that are used only during sync contaminated the >> set of local branches I have, if I were a user of git-p4. Would it >> make sense to use "refs/git-p4-tmp" or something instead? > Yes, "refs/git-p4-tmp" would work equally well. Plus, you are right. A minor test adjustment is necessary (although the tests pass without adjustment). I will post a full patch. - Lars