From 565fb8dcd41eefb373ec6dc71dc2f19884d29cdc Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@github.com>
Date: Sat, 25 Jun 2016 20:02:45 -0400
Subject: [PATCH] revwalk: introduce tests that hide old commits

Introduce some tests that show some commits, while hiding some commits
that have a timestamp older than the common ancestors of these two
commits.
---
 tests/odb/foreach.c                           |   8 +--
 .../43/da5ec3274dd061df152ff5e69853d562b01842 |   2 +
 .../43/e968a905a821532069bb413801d35b200631cf |   4 ++
 .../5d/0f8f7891e872d284beef38254882dc879b2602 | Bin 0 -> 149 bytes
 .../5f/34cd6e3285089647165983482cf90873d50940 | Bin 0 -> 37 bytes
 .../8e/73b769e97678d684b809b163bebdae2911720f |   2 +
 .../b2/04707bbc546a1a770ef6ced37c7089cc3bfe6b |   2 +
 .../b2/35959d89084af8d3544fbdf675e47944f86524 | Bin 0 -> 77 bytes
 .../b9/1e763008b10db366442469339f90a2b8400d0a | Bin 0 -> 206 bytes
 .../bd/758010071961f28336333bc41e9c64c9a64866 | Bin 0 -> 162 bytes
 .../db/4df74a2fc340a0d0cb0cafc0db471fdfff1048 |   2 +
 .../db/793a00a5615eca1aac97e42b3a68b1acfa8bfd | Bin 0 -> 193 bytes
 .../db/c0be625bed24b5d8f5d9a927484f2065d321af | Bin 0 -> 175 bytes
 .../f0/a2a10243ca64f935dbe3dccb89ec8bf16bdace | Bin 0 -> 38 bytes
 tests/revwalk/basic.c                         |  48 ++++++++++++++++++
 15 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 tests/resources/testrepo.git/objects/43/da5ec3274dd061df152ff5e69853d562b01842
 create mode 100644 tests/resources/testrepo.git/objects/43/e968a905a821532069bb413801d35b200631cf
 create mode 100644 tests/resources/testrepo.git/objects/5d/0f8f7891e872d284beef38254882dc879b2602
 create mode 100644 tests/resources/testrepo.git/objects/5f/34cd6e3285089647165983482cf90873d50940
 create mode 100644 tests/resources/testrepo.git/objects/8e/73b769e97678d684b809b163bebdae2911720f
 create mode 100644 tests/resources/testrepo.git/objects/b2/04707bbc546a1a770ef6ced37c7089cc3bfe6b
 create mode 100644 tests/resources/testrepo.git/objects/b2/35959d89084af8d3544fbdf675e47944f86524
 create mode 100644 tests/resources/testrepo.git/objects/b9/1e763008b10db366442469339f90a2b8400d0a
 create mode 100644 tests/resources/testrepo.git/objects/bd/758010071961f28336333bc41e9c64c9a64866
 create mode 100644 tests/resources/testrepo.git/objects/db/4df74a2fc340a0d0cb0cafc0db471fdfff1048
 create mode 100644 tests/resources/testrepo.git/objects/db/793a00a5615eca1aac97e42b3a68b1acfa8bfd
 create mode 100644 tests/resources/testrepo.git/objects/db/c0be625bed24b5d8f5d9a927484f2065d321af
 create mode 100644 tests/resources/testrepo.git/objects/f0/a2a10243ca64f935dbe3dccb89ec8bf16bdace

diff --git a/tests/odb/foreach.c b/tests/odb/foreach.c
index 12b81b4f1..42d706467 100644
--- a/tests/odb/foreach.c
+++ b/tests/odb/foreach.c
@@ -28,8 +28,8 @@ static int foreach_cb(const git_oid *oid, void *data)
 
 /*
  * $ git --git-dir tests/resources/testrepo.git count-objects --verbose
- * count: 47
- * size: 4
+ * count: 60
+ * size: 240
  * in-pack: 1640
  * packs: 3
  * size-pack: 425
@@ -44,7 +44,7 @@ void test_odb_foreach__foreach(void)
 	git_repository_odb(&_odb, _repo);
 
 	cl_git_pass(git_odb_foreach(_odb, foreach_cb, &nobj));
-	cl_assert_equal_i(47 + 1640, nobj); /* count + in-pack */
+	cl_assert_equal_i(60 + 1640, nobj); /* count + in-pack */
 }
 
 void test_odb_foreach__one_pack(void)
@@ -118,7 +118,7 @@ void test_odb_foreach__files_in_objects_dir(void)
 
 	cl_git_pass(git_repository_odb(&odb, repo));
 	cl_git_pass(git_odb_foreach(odb, foreach_cb, &nobj));
-	cl_assert_equal_i(47 + 1640, nobj); /* count + in-pack */
+	cl_assert_equal_i(60 + 1640, nobj); /* count + in-pack */
 
 	git_odb_free(odb);
 	git_repository_free(repo);
diff --git a/tests/resources/testrepo.git/objects/43/da5ec3274dd061df152ff5e69853d562b01842 b/tests/resources/testrepo.git/objects/43/da5ec3274dd061df152ff5e69853d562b01842
new file mode 100644
index 000000000..298feece4
--- /dev/null
+++ b/tests/resources/testrepo.git/objects/43/da5ec3274dd061df152ff5e69853d562b01842
@@ -0,0 +1,2 @@
+x
-�]jC!F��*f)�]��@�
+�
�8��Z��ۯi�v��>����Os0�B%s)f���M�l�h�V4�5������	�&4ѕ@:�D�)oIr`���$�L����Y��w�s¥F��������g������`�$��b����
o�;������U|����zO��u}��/�._���ׁ~��
��J
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/objects/43/e968a905a821532069bb413801d35b200631cf b/tests/resources/testrepo.git/objects/43/e968a905a821532069bb413801d35b200631cf
new file mode 100644
index 000000000..ec04abf68
--- /dev/null
+++ b/tests/resources/testrepo.git/objects/43/e968a905a821532069bb413801d35b200631cf
@@ -0,0 +1,4 @@
+x
��K
+1]�}
%�N'
7�����8����
+���\�u�5zc���
6��8�b,��D�2�0�'�Q�b㭃�@ҩ�R��Q�[��94�)�
�q�smp+��
+�纾�g�G����=�r]/��3�((��tR�a������>���E�
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/objects/5d/0f8f7891e872d284beef38254882dc879b2602 b/tests/resources/testrepo.git/objects/5d/0f8f7891e872d284beef38254882dc879b2602
new file mode 100644
index 0000000000000000000000000000000000000000..7a22451ed894b5a42364a7f66369ebcbdc7e8f98
GIT binary patch
literal 149
zcmV;G0BZku0V^p=O;s>7F=Q|_FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8
zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz
zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Ak`Id(GC7}0`DuFl@txD1Z@NEb-#P~X4@N+M
D#z04o

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/5f/34cd6e3285089647165983482cf90873d50940 b/tests/resources/testrepo.git/objects/5f/34cd6e3285089647165983482cf90873d50940
new file mode 100644
index 0000000000000000000000000000000000000000..b1df3bdd5cf408c6a576fa3041938b194b268734
GIT binary patch
literal 37
vcmV+=0NVd}0ZYosPf{>4W(dj1ELH%b#5{%koD_wmqQt!93`H&goVE$TEmshD

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/8e/73b769e97678d684b809b163bebdae2911720f b/tests/resources/testrepo.git/objects/8e/73b769e97678d684b809b163bebdae2911720f
new file mode 100644
index 000000000..d75977a25
--- /dev/null
+++ b/tests/resources/testrepo.git/objects/8e/73b769e97678d684b809b163bebdae2911720f
@@ -0,0 +1,2 @@
+x
���j�0�S�)��*a���㚔��+��l8[A������
�
33������y�M$�m�*�� �$q��G?Y�A�5<
��t����8r���5�����7nD#.d��)~�N�0˄�)R,�|,h��jQ*t������C~�	|�u���zҧ�ݗ>����
+ƒ�d����8��\�����S�]!7������s�,[�P2�fw^�
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/objects/b2/04707bbc546a1a770ef6ced37c7089cc3bfe6b b/tests/resources/testrepo.git/objects/b2/04707bbc546a1a770ef6ced37c7089cc3bfe6b
new file mode 100644
index 000000000..f9ec61c1e
--- /dev/null
+++ b/tests/resources/testrepo.git/objects/b2/04707bbc546a1a770ef6ced37c7089cc3bfe6b
@@ -0,0 +1,2 @@
+x
-�]��0�}�)t�.�QJ),{���-7��^\�^�ҷA�7(���F�W�"��A%�ɣy���g�iTI��d�?_�����#��[��(-�D�0wdp����R*\Bi
~�����[���;�|m�a�djRj���a�
+���k��R�s���t��m��G"7��{�~��LD�
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/objects/b2/35959d89084af8d3544fbdf675e47944f86524 b/tests/resources/testrepo.git/objects/b2/35959d89084af8d3544fbdf675e47944f86524
new file mode 100644
index 0000000000000000000000000000000000000000..7d563dbd38955498b07eff4660c2b6cff623abbe
GIT binary patch
literal 77
zcmV-T0J8sh0V^p=O;s>6WiT`_Ff%bx2y%6F@pWYoZvB+9etT5d(tXFBocGN(t6p-7
j1F9lFCxs#2<ZPZ%E5|f<vB+i*ou3@VS2-O3h8P)KsmmX|

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/b9/1e763008b10db366442469339f90a2b8400d0a b/tests/resources/testrepo.git/objects/b9/1e763008b10db366442469339f90a2b8400d0a
new file mode 100644
index 0000000000000000000000000000000000000000..7bab59be8c85424a2eb647b681e5aec6caabe453
GIT binary patch
literal 206
zcmV;<05Sh~0iBP%PQ)+}gsJls+g$}(uYcB-(20hUju)`K>r13djB-Bl`UFwXBD&G1
znbAz`>$(iE);)|}6{J)w8pszFa>Yw*UQ$lPF1kh-yjU{1O&@vJZ2$)=Y;u-{DRc71
zr%)5SP?4OnYE`cM>vvXDh&iFpk&L%TV=BcN8_|gMg%E=^wN3dx=Dx$LeCA!?eeUb6
zZ}6-K{Z=oRWz6^TRQq}cLu`qSa~>X%5vPM5uZI3NKfURGQTVBW(_crQVA)28eifR&
I02(=EX>-VC<p2Nx

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/bd/758010071961f28336333bc41e9c64c9a64866 b/tests/resources/testrepo.git/objects/bd/758010071961f28336333bc41e9c64c9a64866
new file mode 100644
index 0000000000000000000000000000000000000000..c5e3b87ad085ec8307defaa340618d9fa936991b
GIT binary patch
literal 162
zcmV;T0A2rh0iBLZ3c@fH0A1%4?*dBx?*&BMcmpqxCNHgvBvMm)ed`t64Fdy{dabVk
z+Njf5nZadQs2~N!ggR@o6LT@7oh8ya5r#>7sl_|4+y<aG8C8tA$Ph6&<$_NEtxr;0
zM&`trFcuNFvGf%ld5>#`=hEw^H@Na)e{`Q;W7(!l>h%W7dQZVQqu?y9l;W_*<=}sN
Q(Rhcn#5S||0*`k|){{(4dH?_b

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/db/4df74a2fc340a0d0cb0cafc0db471fdfff1048 b/tests/resources/testrepo.git/objects/db/4df74a2fc340a0d0cb0cafc0db471fdfff1048
new file mode 100644
index 000000000..5f3d50efa
--- /dev/null
+++ b/tests/resources/testrepo.git/objects/db/4df74a2fc340a0d0cb0cafc0db471fdfff1048
@@ -0,0 +1,2 @@
+x
-�QJ1P�s����Iz2= � �@/�tz7f"�,^߬�W���պp�FW�gk���ѭ�`�$�8J��0c���������5
+�I҈�J>!+��N�U���(�û�1�Di<_�7�.5�O��X�[��#��f����o�;����]�\���e��=��[@t���&�xH��h���YJn
\ No newline at end of file
diff --git a/tests/resources/testrepo.git/objects/db/793a00a5615eca1aac97e42b3a68b1acfa8bfd b/tests/resources/testrepo.git/objects/db/793a00a5615eca1aac97e42b3a68b1acfa8bfd
new file mode 100644
index 0000000000000000000000000000000000000000..ae82880de88232c2d4ea9b6d1f096a847d955b4d
GIT binary patch
literal 193
zcmV;y06zbC0WFSON(3<wMg7hyY6Bycq&i81$iUzVbOTj+OgET`WYV~OGwR>r!a3a7
zYTXAIYo12W8G@z|Rz@EpT3wvZ2?NVgI5^9hSF6bqCH2KU-v$sHG-An#U=d8>b162K
zlEp@k!Xn8aEsBq^wGQvGjRBX9W4po2J^sS^T6zC`j;+3eHlDoE%d)}=J))ZHd^mE4
vxAe_D!N=C>{bA=>e9-y2kL{3upPUOmtiey8rmq-EJNnq*ucUqeBnL|0%C}%Q

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/db/c0be625bed24b5d8f5d9a927484f2065d321af b/tests/resources/testrepo.git/objects/db/c0be625bed24b5d8f5d9a927484f2065d321af
new file mode 100644
index 0000000000000000000000000000000000000000..b966b0b2fda7c481c94a110b27d32c6f7484aa4c
GIT binary patch
literal 175
zcmV;g08syU0V^p=O;s>7H)1d}FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8
zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz
zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Al3$)1%BL$&TpPh$5b$Yve97Z<xk*qZ`8g>J
d@g`^Uj9NLSxr;?Md+7Y+D89<+008njM;gt0RR;h7

literal 0
HcmV?d00001

diff --git a/tests/resources/testrepo.git/objects/f0/a2a10243ca64f935dbe3dccb89ec8bf16bdace b/tests/resources/testrepo.git/objects/f0/a2a10243ca64f935dbe3dccb89ec8bf16bdace
new file mode 100644
index 0000000000000000000000000000000000000000..1b299dc257b712a486bb7ec5bd07720d88001374
GIT binary patch
literal 38
ucmb<m^geacKghr+^@O)>xW_q<Gv5B88Yja&LKr??HYyI<$*?tvYdruf77v&J

literal 0
HcmV?d00001

diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index 5ed7da4eb..7559f72e9 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -473,3 +473,51 @@ void test_revwalk_basic__big_timestamp(void)
 	git_signature_free(sig);
 
 }
+
+/* Ensure that we correctly hide a commit that is (timewise) older
+ * than the commits that we are showing.
+ *
+ * % git rev-list 8e73b76..bd75801
+ * bd758010071961f28336333bc41e9c64c9a64866
+ */
+void test_revwalk_basic__old_hidden_commit_one(void)
+{
+	git_oid new_id, old_id, oid;
+
+	revwalk_basic_setup_walk("testrepo.git");
+
+	cl_git_pass(git_oid_fromstr(&new_id, "bd758010071961f28336333bc41e9c64c9a64866"));
+	cl_git_pass(git_revwalk_push(_walk, &new_id));
+
+	cl_git_pass(git_oid_fromstr(&old_id, "8e73b769e97678d684b809b163bebdae2911720f"));
+	cl_git_pass(git_revwalk_hide(_walk, &old_id));
+
+	cl_git_pass(git_revwalk_next(&oid, _walk));
+	cl_assert(!git_oid_streq(&oid, "bd758010071961f28336333bc41e9c64c9a64866"));
+
+	cl_git_fail_with(GIT_ITEROVER, git_revwalk_next(&oid, _walk));
+}
+
+/* Ensure that we correctly hide a commit that is (timewise) older
+ * than the commits that we are showing.
+ *
+ * % git rev-list bd75801 ^b91e763
+ * bd758010071961f28336333bc41e9c64c9a64866
+ */
+void test_revwalk_basic__old_hidden_commit_two(void)
+{
+	git_oid new_id, old_id, oid;
+
+	revwalk_basic_setup_walk("testrepo.git");
+
+	cl_git_pass(git_oid_fromstr(&new_id, "bd758010071961f28336333bc41e9c64c9a64866"));
+	cl_git_pass(git_revwalk_push(_walk, &new_id));
+
+	cl_git_pass(git_oid_fromstr(&old_id, "b91e763008b10db366442469339f90a2b8400d0a"));
+	cl_git_pass(git_revwalk_hide(_walk, &old_id));
+
+	cl_git_pass(git_revwalk_next(&oid, _walk));
+	cl_assert(!git_oid_streq(&oid, "bd758010071961f28336333bc41e9c64c9a64866"));
+
+	cl_git_fail_with(GIT_ITEROVER, git_revwalk_next(&oid, _walk));
+}