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

Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)

From
Denton Liu <liu.denton@gmail.com>
Date
Jan 23, 2020, 04:29 UTC
Message-ID
<20200123042906.GA29009@generichostname>
In-Reply-To
<xmqqr1zr5e5e.fsf@gitster-ct.c.googlers.com>
Hi Junio,

Sorry, I'm back in school so I haven't had the time to keep up with my contributions very much. Feel free to give my topics lower priority for the next couple of months if they interfere with any other topics.

On Wed, Jan 22, 2020 at 02:18:05PM -0800, Junio C Hamano wrote:
Show 23 quoted lines
> * dl/merge-autostash (2020-01-13) 17 commits
>  - pull: pass --autostash to merge
>  - t5520: make test_pull_autostash() accept expect_parent_num
>  - merge: teach --autostash option
>  - sequencer: unlink autostash in apply_autostash()
>  - sequencer: extract perform_autostash() from rebase
>  - rebase: generify create_autostash()
>  - rebase: extract create_autostash()
>  - reset: extract reset_head() from rebase
>  - rebase: generify reset_head()
>  - rebase: use apply_autostash() from sequencer.c
>  - sequencer: make apply_rebase() accept a path
>  - rebase: use read_oneliner()
>  - sequencer: make read_oneliner() extern
>  - sequencer: configurably warn on non-existent files
>  - sequencer: use file strbuf for read_oneliner()
>  - t7600: use test_write_lines()
>  - Makefile: alphabetically sort += lists
> 
>  "git merge" learns the "--autostash" option.
> 
>  What's the status of this one?  Are people happy with the shape of
>  the code?

I'm not quite happy with this yet. Phillip Wood pointed out that if we do `git reset --hard` mid-merge with a stash, the stash will pop _after_ the reset, which is very surprising since it leaves a dirty tree.

I think I will have time to reroll this on the weekend.
Show 21 quoted lines
> * dl/test-must-fail-fixes-2 (2020-01-07) 16 commits
>  - t4124: only mark git command with test_must_fail
>  - t3507: use test_path_is_missing()
>  - t3507: fix indentation
>  - t3504: do check for conflict marker after failed cherry-pick
>  - t3419: stop losing return code of git command
>  - t3415: increase granularity of test_auto_{fixup,squash}()
>  - t3415: stop losing return codes of git commands
>  - t3310: extract common notes_merge_files_gone()
>  - t3030: use test_path_is_missing()
>  - t2018: replace "sha" with "oid"
>  - t2018: don't lose return code of git commands
>  - t2018: teach do_checkout() to accept `!` arg
>  - t2018: use test_expect_code for failing git commands
>  - t2018: improve style of if-statement
>  - t2018: add space between function name and ()
>  - t2018: remove trailing space from test description
> 
>  Test updates.
> 
>  Will merge to 'next'.

Eric Sunshine sent out a reworded version of "t2018: use test_expect_code for failing git commands"'s commit message. I'll send out that replacement patch later this weekend as well.

Thanks,
Denton
Previous: Johannes SchindelinNext: Junio C Hamano
Message 25 of 33 in “What's cooking in git.git (Jan 2020, #04; Wed, 22)”
  1. Junio C HamanoJan 22, 2020
  2. Elijah NewrenJan 22, 2020
  3. Junio C HamanoJan 22, 2020
  4. SZEDER GáborJan 22, 2020
  5. Junio C HamanoJan 23, 2020
  6. yz/p4-py3, was Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)Johannes Schindelin, Jan 23, 2020
  7. Yang ZhaoJan 23, 2020
  8. SZEDER GáborJan 27, 2020
  9. SZEDER GáborJan 23, 2020
  10. SZEDER GáborJan 23, 2020
  11. Junio C HamanoJan 23, 2020
  12. Yang ZhaoJan 24, 2020
  13. Johannes SchindelinJan 25, 2020
  14. SZEDER GáborJan 25, 2020
  15. Johannes SchindelinJan 26, 2020
  16. Johannes SchindelinJan 23, 2020
  17. SZEDER GáborJan 24, 2020
  18. Johannes SchindelinJan 25, 2020
  19. Junio C HamanoFeb 5, 2020
  20. SZEDER GáborFeb 6, 2020
  21. Johannes SchindelinFeb 6, 2020
  22. SZEDER GáborFeb 6, 2020
  23. Johannes SchindelinFeb 6, 2020
  24. Johannes SchindelinJan 23, 2020
  25. Denton LiuJan 23, 2020
  26. Junio C HamanoJan 23, 2020
  27. Christian CouderJan 23, 2020
  28. Junio C HamanoJan 23, 2020
  29. Denton LiuJan 26, 2020
  30. Junio C HamanoJan 27, 2020
  31. .mailmap: fix erroneous authorship for Derrick StoleeDenton Liu, Jan 27, 2020
  32. Junio C HamanoJan 28, 2020
  33. Denton LiuJan 29, 2020

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.