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

RE: new file leaked onto release branch

From
Brown, Len <len.brown@intel.com>
Date
Dec 14, 2005, 09:58 UTC
Message-ID
<F7DC2337C7631D4386A2DF6E8FB22B300567ED88@hdsmsx401.amr.corp.intel.com>
>What do you use to create these "Auto-update" commits, and how
>can I help you to fix it?

I use the attached script, which I pasted from git/Documentation/howto/using-topic-branches.txt

git.update linus
to get the latest stuff from Linus onto the linus branch
git.update release
to pull linus branch into my release branch
git.update release
to pull linus branch into my test branch

I also use the git.merge script to pull topic branches into either release or test, or to pull release into test. I used git.merge to pull release into acpica because acpica had fallen behind the base at one point, and this may be where the issue happened.

in the case of the acpica topic branch, it was not pulled back into either release or into test after the file in question was added. Indeed, you can pull the acpica branch from the tree on kernel.org.

I'm trying to remember if there were git error message along the way. I do remember an issue with a commit where I had re-named a file and git didn't recognize it as such. so I put this in my git.commit wrapper:

git-udpate-index --add --remove `quilt files` git commit

dunno if that may be related to the issue at hand. I don't really understand this index stuff...

thanks, -Len

Message 1 of 1 in “RE: new file leaked onto release branch”
  1. Brown, LenDec 14, 2005

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.