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

Re: Is it possible to have a file shared between branches?

From
ELEric LEBIGOT <eric.lebigot@normalesup.org>
Date
Apr 12, 2010, 14:46 UTC
Message-ID
<alpine.OSX.2.01.1004121639230.60420@kroll.spectro.jussieu.fr>
In-Reply-To
<m3ljctf0hs.fsf@localhost.localdomain>

Thank you! I can see what is done in the git.git repository, thanks to your pointer, and it looks like I'm trying to get from git. But how do you create and manage such an independent 'todo' branch? This branch appears on the same level as master, in the pages you gave, but you also mention a "non versioned Meta/ directory". Does this mean that the file structure is like the following?

  ./.git
  Meta/.git
  Meta/<todo files>

If yes, how do all branches appear at the same level in http://git.kernel.org/?p=git/git.git;a=summary ? If no, how was the 'todo' branch created? (I would love to have the todo file in the same directory as the rest.)

EOL
On Mon, 12 Apr 2010, Jakub Narebski wrote:
Show 31 quoted lines
> Eric LEBIGOT <Eric.Lebigot@normalesup.org> writes:
>
>> Is it possible for git to track a single file that would be shared
>> accross branches?  Case in point: a to-do list file that describes
>> what has to be done in all the branches; it can be convenient to put
>> all the things that have to be done in a single, shared file, while
>> keeping this to-do list in sync with the code (so that it lists what
>> has been done, and what remains to be done).  Committing in a branch
>> would in effect also commit the shared file in the other branches
>> (another possibility may be to have in effect many "trees" in a single
>> git directory, with a specific tree for the to-do list).
>>
>> Is this something git can do?
>
> Look how it is done in git.git repository.  If I remember it
> correctly, Junio manages separate small repository inside
> non-versioned Meta/ directory inside git.git checkout, which contains
> TODO list and some scripts to help maintenance (e.g. to help generate
> "What's in..." and "What's cooking..." emails).
>
> For distribution this repository is pushed into independent 'todo'
> branch in git.git repository.  It doesn't share commits with other
> "normal" branches, i.e. 'maint', 'master', 'next', 'pu'.
>
> The 'todo' branch can be seen e.g. here:
>  http://git.kernel.org/?p=git/git.git;a=shortlog;h=refs/heads/todo
>
> The history of TODO file can be viewed e.g. here:
>  http://git.kernel.org/?p=git/git.git;a=history;f=TODO;hb=refs/heads/todo
>
>
Previous: Jakub NarebskiNext: Wincent Colaiuta
Message 5 of 7 in “Is it possible to have a file shared between branches?”
  1. Eric LEBIGOTApr 12, 2010
  2. Ævar Arnfjörð BjarmasonApr 12, 2010
  3. Wincent ColaiutaApr 12, 2010
  4. Jakub NarebskiApr 12, 2010
  5. Eric LEBIGOTApr 12, 2010
  6. Wincent ColaiutaApr 12, 2010
  7. Junio C HamanoApr 12, 2010

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.