From nobody Sat Aug 13 15:54:37 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 4M4lVL0rlRz4ZBWG for ; Sat, 13 Aug 2022 15:54:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa33.google.com (mail-vk1-xa33.google.com [IPv6:2607:f8b0:4864:20::a33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4lVK1LkJz3KSB for ; Sat, 13 Aug 2022 15:54:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa33.google.com with SMTP id bq26so1838369vkb.8 for ; Sat, 13 Aug 2022 08:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=dDHPsAtziDCAqQYuwgx2XXTZh1c5mlWVr6gQu8rcUrY=; b=LHhIqZbypR6DAUct2I+yHpsW4pqPwwf6Ik6Bpooi145Fs8elDUritFDB3c65A5ZAJ/ 0/3wnnMEEzOyqFNcwuca5P054YBFvvFGxEsNoeX+6ij65N7U31e0sT8NhXc7ORuHRu1c /k0Q0zZ9q3gXe8N1wrZPtfBr6uw8M7ScCMWkdB73fDWXYn+ap5n5W/2Ymw7TFmrDGKDE Lq1fsKbQW1nts62Lp9yw6BGJHlUmT+lQTGQfp9jB64st64dPgHAuRDzTl795CecD2g0u gT7xsPeH3VPRkn/NcMno7iTzq8eJbOiUPr/Vel8pCmO7FofttYyCioc0VSJCjQIUYTe+ cGLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=dDHPsAtziDCAqQYuwgx2XXTZh1c5mlWVr6gQu8rcUrY=; b=8Neh+JRu0qwlSffyz5CauMIj9WSgY4EmUWrrMxL/xqm0gVDgUsTgmbvuqpO3uV/Yy+ vXka8N2mRTE5kblHPxk6Obnr2uKLQiuBMePtYNjty6uT6Ow6Wa5UqxUT9FHeXuQYntqw D4vSCfiSppuhfrN0DBNpipg9lb49dzUciQq2eDEvWbYdo9GrBoMApy5NV6sfSphbvW58 SFyLEFDPIadckfAZvfIrFRM9fvBdeY3zKatJ7t7ZlkawbHG1dK7gy+qKSdFHktbmHRbM qZRmED5FpHbQXdsKuUjPkSBe6cDIelTxY0hBPS8kXcgzmsAo3ChCKkl0wle3peUa7Gje DtEQ== X-Gm-Message-State: ACgBeo1aKtFRCWzxO9KI0EPxIixbcvE57jtKCQ7OAh8tUlrUjQCUuq/Y 1zQZ7If5rG2OLjlDDkS/5Wmc2KcnwOfFS9Z98NDzVw== X-Google-Smtp-Source: AA6agR7k20SSzhy31l4nGysykWGQuS2fcbD3kuiqLD6HmbtUNz6ZA+dDhM5/fD/bdRTVvTkTx6YlwD/jVK4RPyk25WE= X-Received: by 2002:a1f:dac3:0:b0:377:8cb:4544 with SMTP id r186-20020a1fdac3000000b0037708cb4544mr3797930vkg.7.1660406088456; Sat, 13 Aug 2022 08:54:48 -0700 (PDT) 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 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Sat, 13 Aug 2022 09:54:37 -0600 Message-ID: Subject: Re: git wants to commit more files than expected ? To: Nuno Teixeira Cc: freebsd-git Content-Type: multipart/alternative; boundary="00000000000015f38105e6216b92" X-Rspamd-Queue-Id: 4M4lVK1LkJz3KSB X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=LHhIqZby; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a33) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.00 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a33:from]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; TO_DN_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --00000000000015f38105e6216b92 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Aug 13, 2022 at 9:45 AM Nuno Teixeira wrote: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then commi= t > from scratch :) > > Next commit I do I will use amend and see if I got similar problem like > yours. > git rebase -i freebsd/main main is what I do when I'm working on main and need to 'curate' the commits. Warner > Cheers, > > Kurt Jaeger escreveu no dia s=C3=A1bado, 13/08/2022 =C3= =A0(s) > 16:27: > >> Hi! >> >> > > 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 ? >> >> It was this: >> >> git commit --amend --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> > If I've to guess then you're probably including the '-a' switch of git >> > commit. If yes, then please don't include it. >> >> I now tried this: >> >> git commit --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> and it worked! Thanks! >> >> -- >> pi@FreeBSD.org +49 171 3101372 Now what ? >> >> > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --00000000000015f38105e6216b92 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Aug 13, 2022 at 9:45 AM Nuno = Teixeira <eduardo@freebsd.org= > wrote:
Hi,

I always forgot to use `git = commit --amend` when commit needed some correction/change. I usually do a `= git reset --hard ^HEAD` and then commit from scratch :)

Next commit I do I will use amend and see if I got similar problem li= ke yours.

git rebase -i fre= ebsd/main main

is what I do when I'm working o= n main and need to 'curate' the commits.

W= arner
=C2=A0
Cheers,

Kurt Jaeger <pi@freebsd.org> escr= eveu no dia s=C3=A1bado, 13/08/2022 =C3=A0(s) 16:27:
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/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 ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

--
pi@FreeBSD.org=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+49 171 3101372=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Now what ?



--
Nuno Teixeira
FreeBSD Co= mmitter (ports)
--00000000000015f38105e6216b92--