From nobody Sat Aug 13 15:45:29 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 4M4lHp4m3bz4Z8Mq for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@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 4M4lHp4DVqz3Gj1 for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660405542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1W2sWmMR9gmIUMGGdPZyG1j6H0KED99mEVIPQxtWgCY=; b=qoci9Jj2ROo5GyWcfwMWn/56ZGLmj05Su0DNfpgdvkhh2Ils4iJ/kTn3GZug566852BhDg AU0HeZ6Km6KO5sYZxQQ6kp8BqMZHm8A9ZR3f6k/nfb9Tw/dI39DbyHWTWRmk2eoi61dp0I q3lOG6nAgLM81mQaheyXmAxZKpjb0j+76oEG3H0Mf4v96H2lvFEc0XzmXisFxWX154WW+C +JNpdRmtkQuJvssAhD/CaCX7RRii8P2NXwW1EjUs4qfX8Rw65R7Y3LdHvDtJUyCC6urLGn 1XGctqS1kms4l04Zi8eLaqQcSgCWF9q2rtede1OAbfafOQ+crvvGySZ0/4mPsQ== Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) (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)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lHp31X8zlkm for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f173.google.com with SMTP id t64so1825287vkb.12 for ; Sat, 13 Aug 2022 08:45:42 -0700 (PDT) X-Gm-Message-State: ACgBeo1r0aibSIGVs/LnjePFcGDY1MBaasnUQOry3JwUSjnj8k6M1kHO Ltb0v4VS4NGZzH/AtBoL0zdzL8g2bCCQBSVIaKE= X-Google-Smtp-Source: AA6agR7Ps2B4Um50OiqIObrkYQH5v4Df/5Ii0jh/rGqcHMDTodgKD3zSkqRUwOwG55QBR1p5CVY8lKSZKR6fBXAJPcc= X-Received: by 2002:a1f:41c8:0:b0:377:1352:8f9d with SMTP id o191-20020a1f41c8000000b0037713528f9dmr3731954vka.25.1660405541724; Sat, 13 Aug 2022 08:45:41 -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: Nuno Teixeira Date: Sat, 13 Aug 2022 16:45:29 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git wants to commit more files than expected ? To: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007f6cee05e6214a0c" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660405542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1W2sWmMR9gmIUMGGdPZyG1j6H0KED99mEVIPQxtWgCY=; b=XYa5+v/qEXTUEu+I61EMnAmgref8qlfb4h6dqtKD/qcy6dJWEaMwd7nNjpsf+NrZfhtLdW l2/IDe/TM6G+Sb4vRqEClwA8xnXp3iW3qM4goJCDjULBEtZbdK3cI9w52b0pGLlIAH+oUL kLmuN2gIhi3zJohLUC656m9zvmRbJu+Q4boH/rWV4cKfDU/CdDhz/O5XEJdAKxAXo65exw HH/vybWCFMI8w9YjfClqFkCHgR49IZ1Sn5OkqsN2DIU6Fo9bfKvgUKgg5H+wbGR7iookGM dcXjnSvS34DUrC7piRLRIdjJ85yV1twUz5dF23Gb/r2XhXRMzMk7qM2jX5ODNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660405542; a=rsa-sha256; cv=none; b=v/ObPhJotmzxRvXvqvs+QEUnkCijO2htSw4eAEus/pV9e8qBCsHSaEQHVXtk0YiAJ+k5u3 zaowLSS16A/bLh8hoKCH7WHRaN5Y6lk+3I5CSNQ1hKtMZIU0K8XOV2nAJmO5aNEndw4Dr/ Kxx82P9VH+mW2ReA7bXv17f/tcAfIi6IGkFCISGhrTpPvFVt7wBDtsgRuCFHmJpLHTOvGW reac6Sl9T4o50zKgSLKiUtK52THI2c8MxdceHlAoVmCDf9aLYyx+iO7GT6OBxmCYDQWiKt q9FPO2Xs1UhT5LlBux6e3vJ/XHYgJLSnX43xyzqMSANva+Ht1qvHC7GKtGClrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000007f6cee05e6214a0c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 like yours. 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 ? > > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000007f6cee05e6214a0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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 :)

<= /div>
Next commit I do I will use amend and see if I got similar proble= m like yours.

Cheers,

Kurt Jaeger <pi@freebsd.org> 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:
> > #=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 ?



--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000007f6cee05e6214a0c--