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

Re: [PATCH 3/3] octopus: remove dead code

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 12, 2009, 01:01 UTC
Message-ID
<7viqcdxaxt.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1260578339-30750-3-git-send-email-bebarino@gmail.com>
Stephen Boyd <bebarino@gmail.com> writes:
Show 7 quoted lines
> MSG, PARENT, and CNT are never used, just assigned to.
>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> I don't know if this is wanted. Looks like maybe they're used
> as simple debug aides?

No, thanks for spotting. It is the right thing to do to just get rid of them.

IIRC, they are remnants of ancient logic of the script, even before 91063bb (Multi-backend merge driver., 2005-09-08) that added it to the official git history, and were used to update MRC and to come up with the end result (experimental versions of the script used to run "commit-tree" itself).

Previous: Stephen BoydNext: Alex Riesen
Message 12 of 14 in “FEATURE REQUEST: Announce branch name with merge comamnd”
  1. Jari AaltoDec 11, 2009
  2. Junio C HamanoDec 11, 2009
  3. 1/3 octopus: make merge process simpler to followStephen Boyd, Dec 12, 2009
  4. Junio C HamanoDec 12, 2009
  5. Johannes SixtDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. octopus: make merge process simpler to followStephen Boyd, Dec 15, 2009
  8. Junio C HamanoDec 15, 2009
  9. Stephen BoydDec 15, 2009
  10. 2/3 octopus: reenable fast-forward mergesStephen Boyd, Dec 12, 2009
  11. 3/3 octopus: remove dead codeStephen Boyd, Dec 12, 2009
  12. Junio C HamanoDec 12, 2009
  13. Alex RiesenDec 12, 2009
  14. Jari AaltoDec 12, 2009

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.