From nobody Sat Aug 13 15:43:03 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 4M4lF04RHQz4Z83q for ; Sat, 13 Aug 2022 15:43:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) (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 4M4lDz4XRBz3Fl9 for ; Sat, 13 Aug 2022 15:43:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe33.google.com with SMTP id v128so3464507vsb.10 for ; Sat, 13 Aug 2022 08:43:15 -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=3ZIob4aSTk3UPwCZTT6LyZksJ6x+J1kgCAkf4d6hW0g=; b=4sR0w+56oexRyD2i+4LH0NoW30bpsx8B5fKfGMaYGM8mtqMHMdhz0y+iCCuHhcD8AU 7pQtWKpZ+B3LVQK2jCNGvcTIaf9lHuV0T1LWSqW5QsX0JYBgX7JxkuhdcqCt3++PFmEG yu8mR5Sw5BSLPEdNsxB80W7UlkRlE2Mze76lG9jzuXT4goFXoFDrzJym4cHUDAMSGVTu jhnYv0m/ru6CuMnHh7K5JZ/M0VxuSaNZO6t8pNfM1hwGNZPxSbrJgVSgm9DP1Mqm1l/d +repBs5K2w99mMBioOX+TAGxTihidFgswrnmfc17fP/jjgw0k3eZuwXY7kuJA1q6f0T8 AL+Q== 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=3ZIob4aSTk3UPwCZTT6LyZksJ6x+J1kgCAkf4d6hW0g=; b=R1kW4R0nIiYLDxPyDev8hym0DfnYYTGli83kmJMJgiSquiEQa6gSC8t/2ICptPqspf GpP0ENg4iTW9b9jvNYI498H2LTmc60q0aWkxqYOMwXbajCCjn+qWMg/gp7VYzc0GouHV QTSWp/hDP6mfpVT8DELBKlt34ev0R7vnp9/wvenVjgejRjVuPWiMaLA6qJRZ88hFe4rG 1yVkhdpWrghMi3QM8S+jKE889ddgfx94fZ2eDUHIugSdlrLwx2XainbkivvJ1y5Y4o5g lRNf8voKCr0VSQYPgrhuM9D5314DNVlUyZeeXty6ED5C2RoEgfDeRlXcqALwI2z/8hVN R4pg== X-Gm-Message-State: ACgBeo3xbyN9UgoAGcovgbE6jkWJAHQsKIE2pURJ4amd3lhusuOn6AyO EzI7DvACkb+WNSxnEIKE6ct5uhqorvdTglfG7/8FyQ== X-Google-Smtp-Source: AA6agR7nsz0wELkBl0wJcJuuPA6swpRiE+XPWIElZNx1hzNrKJTSdzVsF5LI81b6nftsTZ1RExXBiOAdA7WygdEPIps= X-Received: by 2002:a67:b208:0:b0:357:e999:441c with SMTP id b8-20020a67b208000000b00357e999441cmr3430912vsf.67.1660405394379; Sat, 13 Aug 2022 08:43:14 -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:43:03 -0600 Message-ID: Subject: Re: git wants to commit more files than expected ? To: Kurt Jaeger Cc: Ashish SHUKLA , freebsd-git Content-Type: multipart/alternative; boundary="000000000000b7291f05e6214171" X-Rspamd-Queue-Id: 4M4lDz4XRBz3Fl9 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=4sR0w+56; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::e33) 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]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e33:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --000000000000b7291f05e6214171 Content-Type: text/plain; charset="UTF-8" On Sat, Aug 13, 2022 at 9:27 AM Kurt Jaeger wrote: > 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='Jose G. Juanino ' > archivers/py-borgbackup > Yes. this was adding borgbackup to the previously committed thing.... > > 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='Jose G. Juanino ' > archivers/py-borgbackup > > and it worked! Thanks! > This is creating a new commit with borgbackup... I'll have to check it out... I'm in need of a good, automated backup... Warner --000000000000b7291f05e6214171 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Aug 13, 2022 at 9:27 AM Kurt = Jaeger <pi@freebsd.org> wrote:<= br>
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

Yes. this was adding b= orgbackup to the previously committed thing....
=C2=A0
> 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!

This is creating= a new commit with borgbackup...

I'll have to = check it out... I'm in need of a good, automated backup...
Warner=C2=A0
--000000000000b7291f05e6214171--