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

Re: [PATCH 1/4] reset: add a few tests for "git reset --merge"

From
Christian Couder <chriscool@tuxfamily.org>
Date
Sep 11, 2009, 05:22 UTC
Message-ID
<200909110722.13331.chriscool@tuxfamily.org>
In-Reply-To
<200909102259.16469.jnareb@gmail.com>
On Thursday 10 September 2009, Jakub Narebski wrote:
Show 17 quoted lines
> Christian Couder wrote:
> > diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
> > new file mode 100755
> > index 0000000..45714ae
> > --- /dev/null
> > +++ b/t/t7110-reset-merge.sh
> > @@ -0,0 +1,70 @@
> > +#!/bin/sh
> > +#
> > +# Copyright (c) 2009 Christian Couder
> > +#
> > +
> > +test_description='Tests for "git reset --merge"'
> > +
> > +exec </dev/null
>
> What does this do?
Nothing! Yeah, this is a mistake.

Thanks for spoting it, Christian.

Previous: Jakub NarebskiNext: Tony Finch
Message 4 of 21 in “"git reset --merge" related improvements”
  1. 0/4 "git reset --merge" related improvementsChristian Couder, Sep 10, 2009
  2. 1/4 reset: add a few tests for "git reset --merge"Christian Couder, Sep 10, 2009
  3. Jakub NarebskiSep 10, 2009
  4. Christian CouderSep 11, 2009
  5. Tony FinchSep 13, 2009
  6. 2/4 reset: use "unpack_trees()" directly instead of "git read-tree"Christian Couder, Sep 10, 2009
  7. Junio C HamanoSep 11, 2009
  8. Christian CouderSep 11, 2009
  9. Junio C HamanoSep 11, 2009
  10. Daniel BarkalowSep 11, 2009
  11. 3/4 reset: add option "--merge-dirty" to "git reset"Christian Couder, Sep 10, 2009
  12. Linus TorvaldsSep 10, 2009
  13. Christian CouderSep 11, 2009
  14. Linus TorvaldsSep 11, 2009
  15. Junio C HamanoSep 11, 2009
  16. 4/4 reset: add test cases for "--merge-dirty" optionChristian Couder, Sep 10, 2009
  17. Daniel BarkalowSep 10, 2009
  18. Christian CouderSep 11, 2009
  19. Daniel BarkalowSep 11, 2009
  20. Christian CouderSep 15, 2009
  21. Paolo BonziniSep 13, 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.