Bug 254900

Summary: Make update in /usr/src doesn't work with git
Product: Base System Reporter: sjrbulk
Component: miscAssignee: Mark Linimon <linimon>
Status: Closed Overcome By Events    
Severity: Affects Only Me CC: emaste, jhb, takefu
Priority: ---    
Version: Unspecified   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
Patch for /usr/src/Makefile.inc1 to allow update target to use git
none
Net/gitup support none

Description sjrbulk 2021-04-09 01:15:12 UTC
Created attachment 223936 [details]
Patch for /usr/src/Makefile.inc1 to allow update target to use git

make update in /usr/src doesn't know how to pull an update from git. The attached diff is based upon how /usr/port/Makefile does this.
Comment 1 takefu 2021-04-13 02:01:37 UTC
Created attachment 224071 [details]
Net/gitup support

devel/git and net/gitup support.
And src and ports for updates.
Comment 2 Mark Linimon freebsd_committer freebsd_triage 2021-06-11 23:21:11 UTC
^Triage: mark as overcome by events.

I don't think jhb saw this before his most recent commit (e290182bcf3895ca659dff111bca6a077c4708b1), sorry.
Comment 3 John Baldwin freebsd_committer freebsd_triage 2021-06-11 23:26:03 UTC
Oops, I had not seen it, no.  I'm not sure 'git pull' is really what we'd want to recommend to users which is why I had assumed it was best to just remove the target outright.  Perhaps 'git pull --ff-merge-only' would be ok, but I do think at this point we should just let users manage this directly.  Note that we haven't supported updating docs or ports since the transition to svn for example.