From nobody Sat Aug 13 13:46:20 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4hf66ky3z4YZj1 for ; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4hf663lbz3wJB; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660398382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=krPNWMRl5Qk/UL4+bmj0ZMasdw4aMhwrmNG0Le3yUAA=; b=Y436S8YlmFyhQsKJGl9LI6jAdgG7FmptYs+5qNVDIHSr1yixh4Tttwa4F01a95ODxQKpje 7SRZrGKACtNVyFT++XWJQmo8kr+/ze5poeh/AMZBToD/e24UmonZy/sAB7SJP7DFnlOrfB u3Owt4jo5605lTQqZ3ZopmOrKW7LXC0wJXVg8vzKsaWJkmJpSQMEnW72r/XOGADNoeY585 jlZGwvkakDdbyxoBry7Xhaj76CevU+egjBOCcz5tKfsqMP18fdgPfGN8GFlpIo75cdu9hB EJ73jokyr/PR0bahKsvzitFOGNeRWnFdPwBjBrLRK93yeszKQ7v+9EZHAmTxBQ== Received: from email.lostca.se (anamika.lostca.se [IPv6:2a01:4f9:3b:505c::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: ashish/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4hf6218WzkgN; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@FreeBSD.org) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 13 Aug 2022 19:16:20 +0530 From: Ashish SHUKLA To: Kurt Jaeger Cc: freebsd-git@freebsd.org Subject: Re: git wants to commit more files than expected ? In-Reply-To: References: User-Agent: Roundcube Webmail/1.4.13 Message-ID: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> X-Sender: ashish@FreeBSD.org Organization: The FreeBSD Project ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660398382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=krPNWMRl5Qk/UL4+bmj0ZMasdw4aMhwrmNG0Le3yUAA=; b=V+wfNc9233KAsnWAsk/91Ilt/ecP+qfJ6W6NTG5qSRPPMaHTXhoU5HBAKDN9acHRmE0WBB efGX+tQ6HK7HDHgIB/xgiLlZFBz9ADAeKmv68De9wVR5i9k6R/5eXIXGaQh0PT2PNalHLK Bke0vMAhANSKhMSOpUVAwdKzrqikwbQ57zbQCbIGkE62uGuIKDEIZFT9FRvlxyDKpk1ENr VrczRcZlFTek13NmpOnHMSYeCupNJ4JRkdC+tg+FNWYh1u2OkxJYVDn0O7rCWqvIo0BsBF oqMrBjvz5YbrFbtgxSdkvnMR/DJPu/uWagj0U+z+CLvvprBAhiI82fori2rAqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660398382; a=rsa-sha256; cv=none; b=jDLWu5pK6hhzC3+Vbxfr7RgSq+FP6HY8ir7/s/Kq01u8X5B6o1n/c81zTnKZi+kNlp2LqW EuOnX88LM/mCqacU3xisI+wcsVq1a2rx53GeXQ20HfhlSsXPT2Q1wRRqqwJuqMj4kJUx8q Fowtqs2G+zUY+gFl/ZliRdgrkFvsiYAtBaFKe8BEohcPOy+/OB9mMp5qCnk5S57yqc/rc7 irT8Z3fMO2/1Pb0TLASagqtR/ron+SiYIlhQZS0ve+aI35lSjOP8yb8iSUfq1Lsakat++D SbtjMHlYiOtVEwcEA3USSOoSMZ9HPcL+sARZvkejnqoqsvC2vywiGCWkR66kQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 2022-08-13 15:24, Kurt Jaeger wrote: > Hi! > > I'm trying to commit the fix from > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265060 > > and run into trouble. I have a probably pristine git repo: > > $ git remote -v > freebsd https://git.freebsd.org/ports.git (fetch) > freebsd https://git.freebsd.org/ports.git (push) > > $ git status > On branch main > Your branch is up to date with 'freebsd/main'. > > Changes to be committed: > (use "git restore --staged ..." to unstage) > modified: archivers/py-borgbackup/Makefile > new file: archivers/py-borgbackup/files/patch-setup.py > > But if I run a git commit, additional two files turn up: > > # Changes to be committed: > # modified: archivers/py-borgbackup/Makefile > # new file: archivers/py-borgbackup/files/patch-setup.py > # modified: print/pdf-tools/Makefile > # modified: print/pdf-tools/distinfo > > Why isn't git status not reporting the two pdf-tools files, > but git commit is ? Could you share the 'git commit' command-line that you're using ? If I've to guess then you're probably including the '-a' switch of git commit. If yes, then please don't include it. Thanks! -- Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0