git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Tracking vendor release with Git

From
GTGreg Troxel <gdt@ir.bbn.com>
Date
Jun 11, 2013, 17:29 UTC
Message-ID
<rmi38so1rq7.fsf@fnord.ir.bbn.com>
In-Reply-To
<1370970410-7935-1-git-send-email-ydroneaud@opteya.com>
  I'm trying to setup a workflow to track vendor releases (upstream).
  Each new release are provided as an archive of source code, data,
  documentation, etc.
I've been doing more or less this.  A few comments:
  I suggest that you not view CRLF->LF as a "patch".  I would do EOL
  hygiene as a preprocessing script, with a checked-in script, after
  unpacking the tarball or whatever, and before 'import'.  Otherwise
  it's just going to be too messy.
  I use "vendor.foo" as the branch name.
  If your repo is only for this program, you can ignore this, but
  otherwise you way want to use subtree merge so that vendor.foo: maps
  to master:foo (putting foo in a subtree in master).  This lets you
  have multiple upstreams in one repo, which is useful for system
  building more than maintaining.
  I would avoid rebase.  You are essentially merging someone else's
  branch (that they aren't putting in git, but you are with the
  vendor.foo) into your master.   With regular merge, you can still
  diff, but the natural history will be right.  With rebase each "local
  version" as you call it will have different commits that will not have
  clear ancestry.
Previous: Yann DroneaudNext: Johannes Sixt
Message 2 of 5 in “Tracking vendor release with Git”
  1. Yann DroneaudJun 11, 2013
  2. Greg TroxelJun 11, 2013
  3. Johannes SixtJun 11, 2013
  4. Philip OakleyJun 11, 2013
  5. Carsten FuchsJun 12, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.