git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Heiko Voigt <hvoigt@hvoigt.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jens.lehmann@web.de, jherland@gmail.com
Subject: [PATCH v3 1/4] add missing && to submodule-merge testcase
Date: Wed,  7 Jul 2010 15:39:10 +0200	[thread overview]
Message-ID: <5eacc71cb957723a780d20567cb66a8b83384253.1278508352.git.hvoigt@hvoigt.net> (raw)
In-Reply-To: <cover.1278508352.git.hvoigt@hvoigt.net>
In-Reply-To: <cover.1278508352.git.hvoigt@hvoigt.net>

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
 t/t7405-submodule-merge.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 9a21f78..4a7b893 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -45,7 +45,7 @@ test_expect_success setup '
 	 git commit -m sub-b) &&
 	git add sub &&
 	test_tick &&
-	git commit -m b
+	git commit -m b &&
 
 	git checkout -b c a &&
 	git merge -s ours b &&
-- 
1.7.2.rc1.13.g513fa.dirty

  reply	other threads:[~2010-07-07 13:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07 13:39 [PATCH v3 0/4] implement automatic submodule merge strategy when possible Heiko Voigt
2010-07-07 13:39 ` Heiko Voigt [this message]
2010-07-07 13:39 ` [PATCH v3 2/4] teach ref iteration module about submodules Heiko Voigt
2010-07-07 13:39 ` [PATCH v3 3/4] setup_revisions(): allow walking history in a submodule Heiko Voigt
2010-07-07 13:39 ` [PATCH v3 4/4] implement automatic fast-forward merge for submodules Heiko Voigt
2010-07-07 16:56   ` Junio C Hamano
2010-07-07 17:11     ` Heiko Voigt

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=5eacc71cb957723a780d20567cb66a8b83384253.1278508352.git.hvoigt@hvoigt.net \
    --to=hvoigt@hvoigt.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jens.lehmann@web.de \
    --cc=jherland@gmail.com \
    /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).