| commit | d212cef936d689d2a3b0932e678fce255362c72a | |
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Sun, 26 Sep 2010 05:20:18 +0000 (26 07:20 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Sep 2010 18:40:45 +0000 (27 11:40 -0700) | ||
| tree | 8b5509918daf2411216af447f93714bbba37bc3b | treesnapshot (tar.gz zip) |
| parent | 831a8b843bc04bdac989514652149787b7f43da0 | commitdiff |
t6050 (replace): fix bogus "fetch branch with replacement" test
The test was missing some "&&" at the end of some lines and it
was wrong because, as the replacement refs were not fetched,
the commits from the parallel branch should not show up. This
was found by Elijah Newren.
This is fixed by checking that after the branch from HASH6 is
fetched, the commits from the parallel branch don't show up,
and then by fetching the replacement refs and checking that
they do show up afterwards.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The test was missing some "&&" at the end of some lines and it
was wrong because, as the replacement refs were not fetched,
the commits from the parallel branch should not show up. This
was found by Elijah Newren.
This is fixed by checking that after the branch from HASH6 is
fetched, the commits from the parallel branch don't show up,
and then by fetching the replacement refs and checking that
they do show up afterwards.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6050-replace.sh | diffblobblamehistory |