RE: new file leaked onto release branch

>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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html