Re: new file leaked onto release branch

"Brown, Len" <len.brown@intel.com> writes:

I reviewed it once again right now. The document claims to be last updated for 0.99.9f, but I do not see anything outdated in there for the latest. Tony's procedure looks valid [*1*], so do the scripts you sent in this thread.

Sorry, but I do not seem to be able to spot anything obviously wrong with your troubled commits nor scripts. I'll do some more digging, including rewinding to an older git and trying them, but I am pessimistic.

I pointed out one anomaly which is the commit should never have been created because it was not even a fast forward but already up-to-date case, and it was followed up with exchange of a few messages between Linus and you. But even if we got that mixed up, the resulting merge should not have contained the file neither parents had. That part worries me the most.

One question. You mentioned these in your message, you have a "git.commit wrapper" that contains these lines:

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

I am not familiar with 'quilt', but is "quilt files" the command to show the list of files with patches applied to the working tree?

If so, the above do tell git about the modified (including added or removed) files that the applied quilt patches touch, which sounds like the correct thing to do.

But the resulting commit from that procedure would not be a merge commit, and the commit in question that had the rsinfo file magically appeared from nowhere is a merge, so this does not seem to have much to do with the current problem...

Still puzzlled, sorry.

[Footnote]

*1* Except that the rsync transport is probably suboptimal for people who stay reasonably up-to-date with Linus and I would apply the following change if I were Tony, but that shouldn't have anything to do with the trouble we are discussing here.

---