git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>,
	Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH 1/4] reset: add a few tests for "git reset --merge"
Date: Fri, 11 Sep 2009 07:22:13 +0200	[thread overview]
Message-ID: <200909110722.13331.chriscool@tuxfamily.org> (raw)
In-Reply-To: <200909102259.16469.jnareb@gmail.com>

On Thursday 10 September 2009, Jakub Narebski wrote:
> 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.

  reply	other threads:[~2009-09-11  5:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-10 20:23 [PATCH 0/4] "git reset --merge" related improvements Christian Couder
2009-09-10 20:23 ` [PATCH 1/4] reset: add a few tests for "git reset --merge" Christian Couder
2009-09-10 20:59   ` Jakub Narebski
2009-09-11  5:22     ` Christian Couder [this message]
2009-09-13 22:01       ` Tony Finch
2009-09-10 20:23 ` [PATCH 2/4] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2009-09-11  5:20   ` Junio C Hamano
2009-09-11  5:34     ` Christian Couder
2009-09-11  5:55       ` Junio C Hamano
2009-09-11  6:32       ` Daniel Barkalow
2009-09-10 20:23 ` [PATCH 3/4] reset: add option "--merge-dirty" to "git reset" Christian Couder
2009-09-10 23:24   ` Linus Torvalds
2009-09-11  5:29     ` Christian Couder
2009-09-11 16:02       ` Linus Torvalds
2009-09-11  5:34   ` Junio C Hamano
2009-09-10 20:23 ` [PATCH 4/4] reset: add test cases for "--merge-dirty" option Christian Couder
2009-09-10 22:14   ` Daniel Barkalow
2009-09-11  5:05     ` Christian Couder
2009-09-11  5:36       ` Daniel Barkalow
2009-09-15  4:32         ` Christian Couder
2009-09-13 22:15       ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200909110722.13331.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=s-beyer@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).