From nobody Mon May 24 15:13:50 2021 X-Original-To: doc@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 894BAA7CAD1 for ; Mon, 24 May 2021 15:13:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fpght2njMz4sn1 for ; Mon, 24 May 2021 15:13:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30DE64965 for ; Mon, 24 May 2021 15:13:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 14OFDobf091104 for ; Mon, 24 May 2021 15:13:50 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 14OFDoch091103 for doc@FreeBSD.org; Mon, 24 May 2021 15:13:50 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 256122] Git operations in section 11.1 of the Porters Manual do not work. Date: Mon, 24 May 2021 15:13:50 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Documentation X-Bugzilla-Component: Documentation X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: ports@nicandneal.net X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: doc@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform bug_file_loc op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Documentation project List-Archive: https://lists.freebsd.org/archives/freebsd-doc List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-doc@freebsd.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256122 Bug ID: 256122 Summary: Git operations in section 11.1 of the Porters Manual do not work. Product: Documentation Version: Latest Hardware: Any URL: https://docs.freebsd.org/en/books/porters-handbook/upg rading/ OS: Any Status: New Severity: Affects Some People Priority: --- Component: Documentation Assignee: doc@FreeBSD.org Reporter: ports@nicandneal.net There appear to be two problems with the git instructions as detailed in section 11.1 of the porters manual: 1. The "git pull --rebase" command does not work after adding files to the repository: "error: cannot pull with rebase: You have unstaged changes. error: additionally, your index contains uncommitted changes. error: please commit or stash them." This error message is of course with unstaged and uncommited changes, but either will stop a pull from happening. 2. The "git diff . > ../`make -VPKGNAME`.diff" command does not work if the changes have been staged. Adding the "--staged" option changes this. If we have to commit the changes before we can pull any new updates, how do= we then get a diff of the changes? Is it necessary to commit the changes at all as this will never be pushed anywhere. The old subversion workflow was straightforward and worked, but it's not obvious yet what the required workflow is in git. I am in the middle of a l= arge update to a port, with five new ports that it will be dependent upon, that = is now stalled because I can no longer get an up to date ports repository. --=20 You are receiving this mail because: You are the assignee for the bug.=