All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Heiko Voigt <hvoigt@hvoigt.net>,
	Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH 07/14] bisect: add t6041 for submodule updates
Date: Sun, 15 Jun 2014 19:01:00 +0200	[thread overview]
Message-ID: <539DD14C.4090609@web.de> (raw)
In-Reply-To: <539DD029.4030506@web.de>

Test that the bisect command updates the work tree as expected. To make
that work with the new submodule test framework a git_bisect helper
function is added. This adds a commit after the one given to be switched
to and makes that one the bad commit. The starting point is then given to
bisect as the good commit which makes bisect change the work tree to the
commit in between, which is the commit given.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
 t/t6041-bisect-submodule.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 t/t6041-bisect-submodule.sh

diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
new file mode 100755
index 0000000..4f37d24
--- /dev/null
+++ b/t/t6041-bisect-submodule.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+test_description='bisect can handle submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+git_bisect () {
+	git status -su >expected &&
+	ls -1pR * >>expected &&
+	tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
+	GOOD=$(git rev-parse --verify HEAD) &&
+	git checkout "$1" &&
+	echo "foo" >bar &&
+	git add bar &&
+	git commit -m "bisect bad" &&
+	BAD=$(git rev-parse --verify HEAD) &&
+	git reset --hard HEAD^^ &&
+	git submodule update &&
+	git bisect start &&
+	git bisect good $GOOD &&
+	rm -rf * &&
+	tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
+	git status -su >actual &&
+	ls -1pR * >>actual &&
+	test_cmp expected actual &&
+	git bisect bad $BAD
+}
+
+test_submodule_switch "git_bisect"
+
+test_done
-- 
2.0.0.275.gc479268

  parent reply	other threads:[~2014-06-15 17:01 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-15 16:56 [PATCH 00/14] Add submodule test harness Jens Lehmann
2014-06-15 16:57 ` [PATCH 01/14] test-lib: add test_dir_is_empty() Jens Lehmann
2014-06-16 22:05   ` Junio C Hamano
2014-06-17 16:47     ` Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 16:58 ` [PATCH 02/14] submodules: Add the lib-submodule-update.sh test library Jens Lehmann
2014-06-16 22:49   ` Junio C Hamano
2014-06-17 17:33     ` Jens Lehmann
2014-06-17 18:44       ` Junio C Hamano
2014-06-17 20:46         ` Jens Lehmann
2014-06-17 21:05           ` Junio C Hamano
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-20 17:31     ` Junio C Hamano
2014-07-01 21:24       ` [PATCH v3 " Jens Lehmann
2014-06-15 16:58 ` [PATCH 03/14] checkout: call the new submodule update test framework Jens Lehmann
2014-06-15 16:59 ` [PATCH 04/14] apply: add t4137 for submodule updates Jens Lehmann
2014-06-15 16:59 ` [PATCH 05/14] read-tree: add t1013 " Jens Lehmann
2014-06-15 17:00 ` [PATCH 06/14] reset: add t7112 " Jens Lehmann
2014-06-15 17:01 ` Jens Lehmann [this message]
2014-06-19 20:12   ` [PATCH v2 07/14] bisect: add t6041 " Jens Lehmann
2014-06-15 17:01 ` [PATCH 08/14] merge: add t7613 " Jens Lehmann
2014-06-15 17:02 ` [PATCH 09/14] rebase: add t3426 " Jens Lehmann
2014-06-16  9:57   ` Eric Sunshine
2014-06-17 17:41     ` Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 17:02 ` [PATCH 10/14] pull: add t5572 " Jens Lehmann
2014-06-15 17:03 ` [PATCH 11/14] cherry-pick: add t3512 " Jens Lehmann
2014-06-15 17:03 ` [PATCH 12/14] am: add t4255 " Jens Lehmann
2014-06-15 17:04 ` [PATCH 13/14] stash: add t3906 " Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-06-15 17:04 ` [PATCH 14/14] revert: add t3513 " Jens Lehmann
2014-06-19 20:12   ` [PATCH v2 " Jens Lehmann
2014-07-02 14:54 ` [PATCH 00/14] Add submodule test harness Torsten Bögershausen
2014-07-02 19:57   ` Jens Lehmann
2014-07-03  5:56     ` Torsten Bögershausen
2014-07-03 21:14       ` Jens Lehmann
2014-07-07 17:05         ` Junio C Hamano
2014-07-07 19:40           ` Torsten Bögershausen
2014-07-08 19:34             ` Jens Lehmann
2014-07-08 20:25               ` Ramsay Jones
2014-07-08 21:03                 ` Ramsay Jones
2014-07-09  6:39                 ` No fchmod() under msygit - Was: " Torsten Bögershausen
2014-07-09 20:00                   ` Eric Wong
2014-07-14 11:31                     ` Erik Faye-Lund
2014-07-14 13:55                       ` Nico Williams
2014-07-14 14:02                         ` Nico Williams
2014-07-14 19:30                     ` Karsten Blees
2014-07-14 21:18                       ` Junio C Hamano
2014-07-09  6:14               ` Torsten Bögershausen
2014-07-09 15:20                 ` Junio C Hamano
2014-07-09 18:19                 ` Jens Lehmann
2014-07-09 19:31                   ` Junio C Hamano
2014-07-10 20:52                     ` Junio C Hamano
2014-07-12 18:23                       ` Jens Lehmann
2014-07-14  1:01                         ` Junio C Hamano
2014-07-14 18:22                           ` Jens Lehmann
2014-07-14 21:18                             ` Junio C Hamano
2014-07-09 17:21               ` Johannes Sixt
2014-07-09 19:22                 ` Junio C Hamano
2014-07-09 19:56                   ` Eric Wong
2014-07-09 21:57                     ` Junio C Hamano
2014-07-10  6:22                       ` No fchmd. was: " Torsten Bögershausen
2014-07-10 19:49                         ` Junio C Hamano
2014-07-10 20:55                           ` Torsten Bögershausen
2014-07-10 21:43                             ` Junio C Hamano

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

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

  git send-email \
    --in-reply-to=539DD14C.4090609@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.