diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2008-05-22 22:38:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 05:16:45 (GMT) |
| commit | 9d0cd91c4e497192e89177847d1511acea5793cd (patch) | |
| tree | 63bea42ac1d0bfa0fb956814ec94fc465d57a3cd /t/t6030-bisect-porcelain.sh | |
| parent | d3aca58562ee5c4af5266affd942c58dcb9f064d (diff) | |
| download | git-9d0cd91c4e497192e89177847d1511acea5793cd.zip git-9d0cd91c4e497192e89177847d1511acea5793cd.tar.gz git-9d0cd91c4e497192e89177847d1511acea5793cd.tar.bz2 | |
bisect: fix left over "BISECT_START" file when starting with junk rev
Before this patch, when using for example:
$ git bisect start <stuff1> <stuff2>
with <stuff1> or <stuff2> that cannot be parsed as a revision, we
could leave a ".git/BISECT_START" file, from a previous
"git bisect start", alone.
This patch makes sure that it does not happen by removing the
"BISECT_START" file in "bisect_clean_state" and then always writing
it again at the end of "bisect_start".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 7557fa1..68b5440 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -138,7 +138,7 @@ test_expect_success 'bisect start: back in good branch' ' grep "* other" branch.output > /dev/null ' -test_expect_failure 'bisect start: no ".git/BISECT_START" if junk rev' ' +test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' ' git bisect start $HASH4 $HASH1 -- && git bisect good && test_must_fail git bisect start $HASH4 foo -- && |