Re: Any plan to fix ports git main history compatibility with old GitHub master?

[Eric Turgeon]

Thanks! I was able to fix that this morning and I just merged back from
main and everything is working fine.

*Eric Turgeon*


On Tue, Apr 6, 2021 at 2:08 PM Ulrich Spörlein  wrote:

> On Mon, 2021-04-05 at 21:45:57 +, Brooks Davis wrote:
> >On Mon, Apr 05, 2021 at 05:33:08PM -0300, Eric Turgeon wrote:
> >> Today when trying to sync the GhostBSD ports tree with the FreeBSD ports
> >> tree, I found out the main branch history is not compatible with the old
> >> GitHub master.
> >>
> >> Any plan to migrate to main with hold git history as we had with
> >> freebsd-src?
> >
> >The main branch will contain a commit which is identical to the last
> >commit of the old master branch (except for the hash).  If the GhostBSD
> >repo is merged up to that point, you can then merge the matching commit
> >from main and proceed with using main as the source for future merges.
> >
> >If you have outstanding WIPs the process of updating them to the new
> history
> >should be about the same as the one for source:
> >
> https://github.com/freebsd/freebsd-doc/blob/main/documentation/content/en/articles/committers-guide/_index.adoc#562-migrating-from-github-fork
>
> This special commit was only provided for the `src` repo and will not be
> provided for the ports repo. It is fairly trivial to do this yourself
> and there's documentation around this here:
>
> https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree
>
>
> It should roughly go like this:
> 1. add both remotes and fetch from them
> 2. merge into old master as usual (this is
> e010feae47ac7fda1354fb3b12290a5ee42ef590)
> 3. merge into main at the same instant in time, using your own tree:
> git merge -s ours --allow-unrelated-histories
> 3cc0c0d66a065554459bd2f9b4f80cc07426464a
> 4. now merge into the new origin/main from now on and forevermore
>
> hth, please let me know if you need further help!
> Uli
>
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: FreeCAD

[LuMiWa via freebsd-ports]

On Tue, 6 Apr 2021 22:14:21 +0200
Christoph Moench-Tegeder  wrote:

> ## LuMiWa via freebsd-ports (freebsd-ports@freebsd.org):
> 
> > I try to install cad/freecad and it pulls lang/Python 27.
> 
> FreeCAD itself depends on Python "3.6 or higher". What exactly did
> you do?
> 
> >  I didn't install.
> 
> So you're sying it's not relevant anymore anyway?
> 
> Regards,
> Christoph
> 

I didn't install because it pull Python 2.7. I didn't change any
configuration. FreeCAD has just collada but other I left default. QT
Web engine pulls Gstreamer and I thing something from Gstreamer pulls
Python 2.7.

Thank you.

-- 
“We live in a world where there is more and more information, and less
and less meaning.”

Jean Baudrillard
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: FreeCAD

[Christoph Moench-Tegeder]

## LuMiWa via freebsd-ports (freebsd-ports@freebsd.org):

> I try to install cad/freecad and it pulls lang/Python 27.

FreeCAD itself depends on Python "3.6 or higher". What exactly did
you do?

>  I didn't install.

So you're sying it's not relevant anymore anyway?

Regards,
Christoph

-- 
Spare Space
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

The whole git migration of ports

[Dan Mahoney (Ports)]

Hey there,

I wanted to reach out to the people both doing the massive migration, as well 
as the people covering answers to frequent questions here on the lists, and I’m 
sure on the forums and elsewhere.

There’s something important to know:

Thank you.  Seriously.  

Open source is often thankless, and users can complain loudly when their 
process is interrupted or altered.  I see the time and effort you’re putting in 
to this.

That’s all.

Keep on fighting the good fight, and stay safe.

-Dan Mahoney
Sysadmin, port maintainer, BSD fan
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Jose Quinteiro]

On 4/6/21 10:25 AM, Michael Gmelin wrote:
> Hi Jose,
> 
> On Tue, 6 Apr 2021 08:33:27 -0700
> Jose Quinteiro  wrote:
> 
> ...
> This information is not correct.
> 
You are absolutely right. Sorry for the bad information!

Thanks,
Jose
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Michael Gmelin]

Hi Jose,

On Tue, 6 Apr 2021 08:33:27 -0700
Jose Quinteiro  wrote:

> On 4/6/21 6:28 AM, Michael Gmelin wrote:
> > Example:
> > 
> >   git config core.excludesFile=$HOME/.gitexcludes
> >   echo .sujournal >>$HOME/.gitexcludes
> > 
> > In case you don't want to override the excludesFile setting, alter
> > one of the config files in the default global location
> > $XDG_CONFIG_HOME/git/ignore[0].
> >   
> The default name for these files is .gitignore. A file with that name
> in your home directory will be honored in all git repositories with no
> further configuration.

This information is not correct.

Example:

  [root@testhost /usr/ports]# cat $HOME/.gitconfig
  [user]
  email = free...@grem.de
  name = Michael Gmelin
  [root@testhost /usr/ports]# cat $HOME/.gitignore
  t.ignoreme
  [root@testhost /usr/ports]# touch t.ignoreme
  [root@testhost /usr/ports]# git status
  On branch main
  Your branch is up to date with 'origin/main'.

  Untracked files:
(use "git add ..." to include in what will be committed)
  t.ignoreme

  nothing added to commit but untracked files present (use "git add" to
  track)
  [root@testhost /usr/ports]# Oh no!

> 
> A file called .gitignore in the current directory will add and/or
> override patterns to/in the global .gitignore in your home directory.
> See
> 
> https://git-scm.com/docs/gitignore

You link to the correct man page. This man page describes the behavior
perceived in the example above accurately though (and also repeats parts
of what I quoted from git-config(1) about the default locations of these
files in in my previous email):

  "Which file to place a pattern in depends on how the pattern is meant
  to be used:

  - Patterns which should be version-controlled and distributed to other
repositories via clone (i.e., files that all developers will want to
ignore) should go into a .gitignore file.
  - Patterns which are specific to a particular repository but which do
not need to be shared with other related repositories (e.g.,
auxiliary files that live inside the repository but are specific to
one user's workflow) should go into the $GIT_DIR/info/exclude
file.
  - Patterns which a user wants Git to ignore in all situations (e.g.,
backup or temporary files generated by the user's editor of choice)
generally go into a file specified by core.excludesFile in the
user's ~/.gitconfig. Its default value is
$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set
or empty, $HOME/.config/git/ignore is used instead."

   -- Quoted from gitignore(5)

As you can see, $HOME/.gitignore is not part of it. As .gitignore is
meant to be checked into repos, I would also advise against setting
`core.excludesFile=$HOME/.gitignore'. Instead I would either set it to
a distinct filename (e.g., $HOME/.gitexcludes) or stick with the
default location ($HOME/.config/git/ignore) for per-user global
excludes.

Best,
Michael
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: Any plan to fix ports git main history compatibility with old GitHub master?

[Ulrich Spörlein]

On Mon, 2021-04-05 at 21:45:57 +, Brooks Davis wrote:

On Mon, Apr 05, 2021 at 05:33:08PM -0300, Eric Turgeon wrote:

Today when trying to sync the GhostBSD ports tree with the FreeBSD ports
tree, I found out the main branch history is not compatible with the old
GitHub master.

Any plan to migrate to main with hold git history as we had with
freebsd-src?


The main branch will contain a commit which is identical to the last
commit of the old master branch (except for the hash).  If the GhostBSD
repo is merged up to that point, you can then merge the matching commit
from main and proceed with using main as the source for future merges.

If you have outstanding WIPs the process of updating them to the new history
should be about the same as the one for source:
https://github.com/freebsd/freebsd-doc/blob/main/documentation/content/en/articles/committers-guide/_index.adoc#562-migrating-from-github-fork


This special commit was only provided for the `src` repo and will not be 
provided for the ports repo. It is fairly trivial to do this yourself 
and there's documentation around this here: 
https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree



It should roughly go like this:
1. add both remotes and fetch from them
2. merge into old master as usual (this is 
e010feae47ac7fda1354fb3b12290a5ee42ef590)
3. merge into main at the same instant in time, using your own tree:
   git merge -s ours --allow-unrelated-histories 
3cc0c0d66a065554459bd2f9b4f80cc07426464a
4. now merge into the new origin/main from now on and forevermore

hth, please let me know if you need further help!
Uli
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Michael Gmelin]

On Tue, 6 Apr 2021 18:40:44 +0200 (CEST)
Marco Beishuizen  wrote:

> On Tue, 6 Apr 2021, the wise Helge Oldach wrote:
> 
> > Marco Beishuizen wrote on Tue, 06 Apr 2021 15:59:48 +0200 (CEST):  
> >> To avoid possible future problems I placed .sujournal into
> >> $HOME/.gitexcludes as you suggested.  
> >
> > That would work as there is no good reason a .sujournal file would
> > be tracked by any git repo on your system but is kind of an odd
> > placement. I would have added it to /usr/ports/.gitignore - that's
> > the common file name, and this exclusion is obviosuly not global or
> > system related, but specific to your /usr/ports repo being on a
> > file system mount point.

It's very common for .gitgnore to be checked into repos, so local
customizations should never go there. Unsurprisingly, the FreeBSD ports
repo also comes with a .gitignore file, see:
https://cgit.freebsd.org/ports/tree/.gitignore

So you really don't want to touch this for your local changes. Like I
suggested, I would place .sujournal in my user's global exclusion file,
as IMHO this is very specific to the system in question (and as
.sujournal is something you never would want in any repo). If you
really want to store this for some reason inside the /usr/ports tree
(and lose the setting, next time you do a fresh checkout and long have
forgotten about it), you would place it in /usr/ports/.git/info/exclude.

Best,
Michael

> 
> Ok thanks. Will do that.
> 
> Regards,
> Marco
> 



-- 
Michael Gmelin
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Helge Oldach wrote:


Marco Beishuizen wrote on Tue, 06 Apr 2021 15:59:48 +0200 (CEST):

To avoid possible future problems I placed .sujournal into
$HOME/.gitexcludes as you suggested.


That would work as there is no good reason a .sujournal file would be 
tracked by any git repo on your system but is kind of an odd placement. 
I would have added it to /usr/ports/.gitignore - that's the common file 
name, and this exclusion is obviosuly not global or system related, but 
specific to your /usr/ports repo being on a file system mount point.


Ok thanks. Will do that.

Regards,
Marco

--
America is the country where you buy a lifetime
supply of aspirin for one dollar, and use it up in two weeks.
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Jose Quinteiro]

On 4/6/21 6:28 AM, Michael Gmelin wrote:
> Example:
> 
>   git config core.excludesFile=$HOME/.gitexcludes
>   echo .sujournal >>$HOME/.gitexcludes
> 
> In case you don't want to override the excludesFile setting, alter one
> of the config files in the default global location
> $XDG_CONFIG_HOME/git/ignore[0].
> 
The default name for these files is .gitignore. A file with that name in
your home directory will be honored in all git repositories with no
further configuration.

A file called .gitignore in the current directory will add and/or
override patterns to/in the global .gitignore in your home directory. See

https://git-scm.com/docs/gitignore

Thanks,
Jose
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Michael Gmelin wrote:


Sorry, I forgot: git checkout main

Once done, just regularly: git pull --ff-only

Explanation: "clone" is roughly equivalent to "init + remote add +
checkout". Separating the three steps will allow for the -f (--force)
option on "remote add" which will ignore already existing files.



Kind of re-sending what I wrote earlier, as I managed to have diverging
HTML and plain text alternatives in my previous email (facepalm).

I wouldn't bother to get all these details right and instead just clone
somewhere else and move files into place, e.g.:

 cd /usr/ports
 git clone https://git.freebsd.org/ports.git removeme
 mv removeme/.* removeme/* .
 rmdir removeme
 git status
 git pull

Note that "Invalid Arguments" errors are expected on the mv command
(this could be replaced by a fancy find command, like `find removeme \
-mindepth 1 -maxdepth 1 -exec mv {} . \;`, but this was easier).

Also, in case "git status" shows something like "Untracked filed
.sujournal", add ".sujournal" to your global git excludes file.

Example:

 git config core.excludesFile=$HOME/.gitexcludes
 echo .sujournal >>$HOME/.gitexcludes

In case you don't want to override the excludesFile setting, alter one
of the config files in the default global location
$XDG_CONFIG_HOME/git/ignore[0].


Thanks for the help. A git checkout does get the portstree into 
/usr/ports. So cloning into another directory and copying it wasn't 
needed.


To avoid possible future problems I placed .sujournal into 
$HOME/.gitexcludes as you suggested.


So it seems to be working again.

Regards,
Marco
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Helge Oldach wrote:


Sorry, I forgot: git checkout main

Once done, just regularly: git pull --ff-only

Explanation: "clone" is roughly equivalent to "init + remote add +
checkout". Separating the three steps will allow for the -f (--force)
option on "remote add" which will ignore already existing files.

Kind regards
Helge


Ah yes, this finally seems to be working. Thanks a lot!

Regards,
Marco

--
Marijuana is nature's way of saying, "Hi!".
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Michael Gmelin]

On Tue, 6 Apr 2021 15:12:42 +0200 (CEST)
free...@oldach.net (Helge Oldach) wrote:

> Marco Beishuizen wrote on Tue, 06 Apr 2021 14:25:51 +0200 (CEST):
> > On Tue, 6 Apr 2021, the wise Helge Oldach wrote:  
> > > cd /usr/ports
> > > git init .
> > > git remote add -t main -f freebsd
> > > https://git.freebsd.org/ports.git  
> > 
> > This created new .git subdirectories but still cannot clone into 
> > /usr/ports.  
> 
> Sorry, I forgot: git checkout main
> 
> Once done, just regularly: git pull --ff-only
> 
> Explanation: "clone" is roughly equivalent to "init + remote add +
> checkout". Separating the three steps will allow for the -f (--force)
> option on "remote add" which will ignore already existing files.
> 

Kind of re-sending what I wrote earlier, as I managed to have diverging
HTML and plain text alternatives in my previous email (facepalm).

I wouldn't bother to get all these details right and instead just clone
somewhere else and move files into place, e.g.:

  cd /usr/ports
  git clone https://git.freebsd.org/ports.git removeme
  mv removeme/.* removeme/* .
  rmdir removeme
  git status
  git pull

Note that "Invalid Arguments" errors are expected on the mv command
(this could be replaced by a fancy find command, like `find removeme \
-mindepth 1 -maxdepth 1 -exec mv {} . \;`, but this was easier).

Also, in case "git status" shows something like "Untracked filed
.sujournal", add ".sujournal" to your global git excludes file.

Example:

  git config core.excludesFile=$HOME/.gitexcludes
  echo .sujournal >>$HOME/.gitexcludes

In case you don't want to override the excludesFile setting, alter one
of the config files in the default global location
$XDG_CONFIG_HOME/git/ignore[0].

Best,
Michael

[0] `man git-config` says:
   core.excludesFile
   Specifies the pathname to the file that contains patterns to
   describe paths that are not meant to be tracked, in addition
   to .gitignore (per-directory) and .git/info/exclude. Defaults to
   $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either
   not set or empty, $HOME/.config/git/ignore is used instead. See
   gitignore(5).


___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Felix Palmen]

* Marco Beishuizen  [20210406 14:35]:
> Pulling isn't possible either:
> 
> ...
> There is no tracking information for the current branch.
> Please specify which branch you want to rebase against.
> See git-pull(1) for details.
> 
> git pull  
> 
> If you wish to set tracking information for this branch you can do so with:
> 
> git branch --set-upstream-to=/ master

So, set up tracking first as suggested. With a remote named "freebsd",
it would be

  git branch --set-upstream-to=freebsd/main master

Note however I would suggest to

1. name your local branch the same as the remote one and
2. name the "default" remote "origin"

Both don't really matter, just conventions (and it will look the same as
the result from cloning). The following commands would achieve it
(untested):

  git init --initial-branch=main .
  git remote add origin https://git.freebsd.org/ports.git
  git branch --set-upstream-to=origin/main main
  git pull

-- 
 Dipl.-Inform. Felix Palmen ,.//..
 {web}  http://palmen-it.de  {jabber} [see email]   ,//palmen-it.de
 {pgp public key} http://palmen-it.de/pub.txt   //   """""""""""
 {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A


signature.asc
Description: PGP signature

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Felix Palmen wrote:


This is meant to avoid cloning, you can just `pull` after adding a
remote to an empty repository.


Pulling isn't possible either:

...
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details.

git pull  

If you wish to set tracking information for this branch you can do so 
with:


git branch --set-upstream-to=/ master
...

--
Behold the fool saith, "Put not all thine eggs in the one basket" -- which
is but a manner of saying, "Scatter your money and your attention"; but
the wise man saith, "Put all your eggs in the one basket and -- watch that
basket!"
-- Mark Twain
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Felix Palmen]

* Marco Beishuizen  [20210406 14:25]:
> On Tue, 6 Apr 2021, the wise Helge Oldach wrote:
> 
> > cd /usr/ports
> > git init .
> > git remote add -t main -f freebsd https://git.freebsd.org/ports.git
> 
> This created new .git subdirectories but still cannot clone into /usr/ports.

This is meant to avoid cloning, you can just `pull` after adding a
remote to an empty repository.

-- 
 Dipl.-Inform. Felix Palmen ,.//..
 {web}  http://palmen-it.de  {jabber} [see email]   ,//palmen-it.de
 {pgp public key} http://palmen-it.de/pub.txt   //   """""""""""
 {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A


signature.asc
Description: PGP signature

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Helge Oldach wrote:


cd /usr/ports
git init .
git remote add -t main -f freebsd https://git.freebsd.org/ports.git

Kind regards
Helge


This created new .git subdirectories but still cannot clone into 
/usr/ports.


--
The minute a man is convinced that he is interesting, he isn't.
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Felix Palmen]

* Marco Beishuizen  [20210406 14:01]:
> From https://git.freebsd.org/ports.git.
> It's up since yesterday. Cloning after totally emptying /usr/ports worked
> fine, but today git complained about corrupt files in the .git subdirectory
> so I decided to start over again.

This was the first commit:
<https://cgit.freebsd.org/ports/commit/?id=ed8d3eda309dd863fb66e04bccaa513eee255cbf>

It's roughly 6 hours ago now. So, if the repository appeared earlier,
I'd just assume it wasn't in its final state yet, therefore some
problems could be expected.

You should now be able to just `pull` further updates.

-- 
 Dipl.-Inform. Felix Palmen ,.//..
 {web}  http://palmen-it.de  {jabber} [see email]   ,//palmen-it.de
 {pgp public key} http://palmen-it.de/pub.txt   //   """""""""""
 {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A


signature.asc
Description: PGP signature

Re: cannot git clone into /usr/ports when separate filesystem

[Michael Gmelin]

> On 6. Apr 2021, at 13:10, Marco Beishuizen 
> wrote:
> 
> Hi,
> 
> I'm trying to git clone the portstree into /usr/ports. /usr/ports is
> a separate filesystem so it contains a .sujournal file. But now git
> complains "fatal: destination path 'ports' already exists and is not
> an empty directory."
> 
> So my question is what to do next? Recreating a new .sujournal every
> time a ports tree needs to be cloned is quite annoying.

Like Felix wrote, you clone exactly once and then you only pull for
updates.

Assuming /usr/ports is empty besides the .sujournal file, I would do:

  cd /usr/ports
  git clone https://git.freebsd.org/ports.git removeme
  mv removeme/.* removeme/* .
  rmdir removeme
  git status
  git pull

Note that "Invalid Arguments" errors are expected on the mv command
(this could be replaced by a fancy find command, like `find removeme \
-mindepth 1 -maxdepth 1 -exec mv {} . \;`, but this was easier).

Also, in case "git status" shows something like "Untracked filed
.sujournal", add ".sujournal" to your global git excludes file.

Example:

  git config core.excludesFile=$HOME/.gitexcludes
  echo .sujournal >>$HOME/.gitexcludes

In case you don't want to override the excludesFile setting, alter one
of the config files in the default global location
$XDG_CONFIG_HOME/git/ignore[0].

Best,
Michael

[0] `man git-config` says:
   core.excludesFile
   Specifies the pathname to the file that contains patterns to
   describe paths that are not meant to be tracked, in addition
   to .gitignore (per-directory) and .git/info/exclude. Defaults to
   $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either
   not set or empty, $HOME/.config/git/ignore is used instead. See
   gitignore(5).
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Felix Palmen wrote:


Where did you clone from? The official repo is only available for a few
hours now. So, if you cloned from a mirror (Github, Gitlab, …?), some
breakage with the transition seems plausible.

Ah, please no CC, thanks.


From https://git.freebsd.org/ports.git.
It's up since yesterday. Cloning after totally emptying /usr/ports worked 
fine, but today git complained about corrupt files in the .git 
subdirectory so I decided to start over again.


Regards,
Marco

--
Thrashing is just virtual crashing.
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Felix Palmen]

* Marco Beishuizen  [20210406 13:47]:
> I did clone it yesterday but today a git pull resulted in a corrupt file for
> some reason, so I decided to start over.

Where did you clone from? The official repo is only available for a few
hours now. So, if you cloned from a mirror (Github, Gitlab, …?), some
breakage with the transition seems plausible.

Ah, please no CC, thanks.

-- 
 Dipl.-Inform. Felix Palmen ,.//..
 {web}  http://palmen-it.de  {jabber} [see email]   ,//palmen-it.de
 {pgp public key} http://palmen-it.de/pub.txt   //   """""""""""
 {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A


signature.asc
Description: PGP signature

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Hans Petter Selasky wrote:


Not sure if it helps, but did you try to add a "/", like:

git clone  /usr/ports/


This doesn't make a difference.
Isn't there a way to force git to clone it into /usr/ports?

Regards,
Marco

--
When the usher noticed a man stretched across three seats in a movie theatre,
he walked over and whispered, "I'm sorry, sir, but you're allowed only a single
seat." The man moaned, but did not budge.  "Sir," the user said more loudly,
"if you don't move, I'll have to call a manager."  The man moaned again but
stayed where he was. The usher left, and returned with the manager, who, after
several more attempts at dislodging the fellow, called the police.
The cop took a look at the reclining man and said, "All right, boyo,
what's your name?"
"Samuel," he mumbled.
"And where're you from, Sam?"
"The balcony."
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

On Tue, 6 Apr 2021, the wise Felix Palmen wrote:

Normally, you should clone only once and use `git pull` afterwards, so 
no problem here. Furthermore, if you don't really need git but just want 
to keep your ports tree up to date, you might want to have a look at 
net/gitup instead.


It's probably still configured to use the Github mirror for ports, so 
grab the new config file (using the repo on git.freebsd.org) from here: 



I did clone it yesterday but today a git pull resulted in a corrupt file 
for some reason, so I decided to start over.


--
Every suicide is a solution to a problem.
-- Jean Baechler
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

Re: cannot git clone into /usr/ports when separate filesystem

[Felix Palmen]

* Marco Beishuizen  [20210406 13:09]:
> So my question is what to do next? Recreating a new .sujournal every time a
> ports tree needs to be cloned is quite annoying.

Normally, you should clone only once and use `git pull` afterwards, so
no problem here. Furthermore, if you don't really need git but just want
to keep your ports tree up to date, you might want to have a look at
net/gitup instead.

It's probably still configured to use the Github mirror for ports, so
grab the new config file (using the repo on git.freebsd.org) from here:
<https://github.com/johnmehr/gitup/blob/main/gitup.conf>

-- 
 Dipl.-Inform. Felix Palmen ,.//..
 {web}  http://palmen-it.de  {jabber} [see email]   ,//palmen-it.de
 {pgp public key} http://palmen-it.de/pub.txt   //   """""""""""
 {pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A


signature.asc
Description: PGP signature

Re: cannot git clone into /usr/ports when separate filesystem

[Hans Petter Selasky]

On 4/6/21 1:09 PM, Marco Beishuizen wrote:

Hi,

I'm trying to git clone the portstree into /usr/ports. /usr/ports is a 
separate filesystem so it contains a .sujournal file. But now git 
complains "fatal: destination path 'ports' already exists and is not an 
empty directory."


So my question is what to do next? Recreating a new .sujournal every 
time a ports tree needs to be cloned is quite annoying.


Not sure if it helps, but did you try to add a "/", like:

git clone  /usr/ports/

--HPS

___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

cannot git clone into /usr/ports when separate filesystem

[Marco Beishuizen]

Hi,

I'm trying to git clone the portstree into /usr/ports. /usr/ports is a 
separate filesystem so it contains a .sujournal file. But now git 
complains "fatal: destination path 'ports' already exists and is not an 
empty directory."


So my question is what to do next? Recreating a new .sujournal every 
time a ports tree needs to be cloned is quite annoying.


Regards,
Marco
--
It has been said that man is a rational animal.  All my life I have
been searching for evidence which could support this.
-- Bertrand Russell
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"

FreeBSD ports you maintain which are out of date

[portscout]

Dear port maintainer,

The portscout new distfile checker has detected that one or more of your
ports appears to be out of date. Please take the opportunity to check
each of the ports listed below, and if possible and appropriate,
submit/commit an update. If any ports have already been updated, you can
safely ignore the entry.

You will not be e-mailed again for any of the port/version combinations
below.

Full details can be found at the following URL:
http://portscout.freebsd.org/po...@freebsd.org.html


Port| Current version | New version
+-+
games/keeperrl  | 0.0.23  | alpha32
+-+


If any of the above results are invalid, please check the following page
for details on how to improve portscout's detection and selection of
distfiles on a per-port basis:

http://portscout.freebsd.org/info/portscout-portconfig.txt

Reported by:portscout!
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"