[Bug 256122] Git operations in section 11.1 of the Porters Manual do not work.

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256122

            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 large
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.

-- 
You are receiving this mail because:
You are the assignee for the bug.