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

Re: [PATCH v2 00/20] object_id part 5

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 7, 2016, 23:05 UTC
Message-ID
<xmqqwpinjopn.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20160907222207.6fdorwi4q4p72gro@vauxhall.crustytoothpaste.net>
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
Show 8 quoted lines
> On Wed, Sep 07, 2016 at 01:12:09PM -0700, Junio C Hamano wrote:
>> It is a bit unfortunate that this conflicts somewhat in builtin/cat-file.c
>> and heavily with builtin/apply.c with other topics in flight.
>> 
>> Let me see how bad the conflict resolution is and report back later.
>
> If it ends up being problematic, feel free to drop the appropriate
> patches and I'll fix them up and send them in in the next set.

Let's see how well I do first ;-) There was another one in wt-status.c that was touched by the "status --porcelain=v2" series, but I haven't finished today's merges yet.

Previous: brian m. carlson
Message 24 of 24 in “object_id part 5”
  1. 00/20 object_id part 5brian m. carlson, Sep 5, 2016
  2. 19/20 builtin/commit-tree: convert to struct object_idbrian m. carlson, Sep 5, 2016
  3. 18/20 builtin/am: convert to struct object_idbrian m. carlson, Sep 5, 2016
  4. 17/20 refs: add an update_ref_oid function.brian m. carlson, Sep 5, 2016
  5. 16/20 sha1_name: convert get_sha1_mb to struct object_idbrian m. carlson, Sep 5, 2016
  6. 15/20 builtin/update-index: convert file to struct object_idbrian m. carlson, Sep 5, 2016
  7. 14/20 notes: convert init_notes to use struct object_idbrian m. carlson, Sep 5, 2016
  8. 13/20 builtin/rm: convert to use struct object_idbrian m. carlson, Sep 5, 2016
  9. 12/20 builtin/blame: convert file to use struct object_idbrian m. carlson, Sep 5, 2016
  10. 10/20 notes-merge: convert struct notes_merge_pair to struct object_idbrian m. carlson, Sep 5, 2016
  11. 11/20 Convert read_mmblob to take struct object_id.brian m. carlson, Sep 5, 2016
  12. 09/20 builtin/checkout: convert some static functions to struct object_idbrian m. carlson, Sep 5, 2016
  13. 08/20 streaming: make stream_blob_to_fd take struct object_idbrian m. carlson, Sep 5, 2016
  14. 20/20 builtin/reset: convert to use struct object_idbrian m. carlson, Sep 5, 2016
  15. 07/20 builtin: convert textconv_object to use struct object_idbrian m. carlson, Sep 5, 2016
  16. 05/20 builtin/cat-file: convert struct expand_data to use struct object_idbrian m. carlson, Sep 5, 2016
  17. 06/20 builtin/cat-file: convert some static functions to struct object_idbrian m. carlson, Sep 5, 2016
  18. 04/20 builtin/log: convert some static functions to use struct object_idbrian m. carlson, Sep 5, 2016
  19. 03/20 builtin/blame: convert struct origin to use struct object_idbrian m. carlson, Sep 5, 2016
  20. 01/20 cache: convert struct cache_entry to use struct object_idbrian m. carlson, Sep 5, 2016
  21. 02/20 builtin/apply: convert static functions to struct object_idbrian m. carlson, Sep 5, 2016
  22. Junio C HamanoSep 7, 2016
  23. brian m. carlsonSep 7, 2016
  24. Junio C HamanoSep 7, 2016

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.