From 34c2d7f6131a26893f87b8a3794267ce2a5e02c2 Mon Sep 17 00:00:00 2001
From: Winston Li <winston.li12@imperial.ac.uk>
Date: Tue, 4 Aug 2015 20:32:41 +0100
Subject: [PATCH] Add test for f385cffd

---
 .../WLGitBridgeIntegrationTest.java           |  29 ++++++-
 .../base/state.json                           |  46 +++++++++++
 .../base/testproj/main.tex                    |   1 +
 .../base/testproj/overleaf-white-410.png      | Bin 0 -> 8786 bytes
 .../base/testproj/test.tex                    |   1 +
 .../withDuplicateBinaryFile/state.json        |  76 ++++++++++++++++++
 .../withDuplicateBinaryFile/testproj/main.tex |   1 +
 .../testproj/overleaf-white-410-copy.png      | Bin 0 -> 8786 bytes
 .../testproj/overleaf-white-410.png           | Bin 0 -> 8786 bytes
 .../withDuplicateBinaryFile/testproj/test.tex |   1 +
 10 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/state.json
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/main.tex
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/overleaf-white-410.png
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/test.tex
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/state.json
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/main.tex
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410-copy.png
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410.png
 create mode 100644 services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/test.tex

diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java
index 9c8f548957..8fe9e36b24 100644
--- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java
+++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java
@@ -56,8 +56,12 @@ public class WLGitBridgeIntegrationTest {
                     put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADeletedBinaryFile/base/state.json")).build());
                     put("withDeletedBinaryFile", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADeletedBinaryFile/withDeletedBinaryFile/state.json")).build());
                 }});
+                put("canPullADuplicateBinaryFile", new HashMap<String, SnapshotAPIState>() {{
+                    put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADuplicateBinaryFile/base/state.json")).build());
+                    put("withDuplicateBinaryFile", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADuplicateBinaryFile/withDuplicateBinaryFile/state.json")).build());
+                }});
                 put("canPullAModifiedNestedFile", new HashMap<String, SnapshotAPIState>() {{
-                    put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullADeletedBinaryFile/base/state.json")).build());
+                    put("base", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullAModifiedNestedFile/base/state.json")).build());
                     put("withModifiedNestedFile", new SnapshotAPIStateBuilder(getResourceAsStream("/canPullAModifiedNestedFile/withModifiedNestedFile/state.json")).build());
                 }});
                 put("canPullDeletedNestedFiles", new HashMap<String, SnapshotAPIState>() {{
@@ -246,6 +250,29 @@ public class WLGitBridgeIntegrationTest {
         assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullADeletedBinaryFile/withDeletedBinaryFile/testproj"), testprojDir.toPath()));
     }
 
+    @Test
+    public void canPullADuplicateBinaryFile() throws IOException, GitAPIException, InterruptedException {
+        MockSnapshotServer server = new MockSnapshotServer(4001, getResource("/canPullADuplicateBinaryFile").toFile());
+        server.start();
+        server.setState(states.get("canPullADuplicateBinaryFile").get("base"));
+        GitBridgeApp wlgb = new GitBridgeApp(new String[] {
+                makeConfigFile(44001, 4001)
+        });
+        wlgb.run();
+        File dir = folder.newFolder();
+        Process gitBase = runtime.exec("git clone http://127.0.0.1:44001/testproj.git", null, dir);
+        int exitCodeBase = gitBase.waitFor();
+        File testprojDir = new File(dir, "testproj");
+        assertEquals(0, exitCodeBase);
+        assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullADuplicateBinaryFile/base/testproj"), testprojDir.toPath()));
+        server.setState(states.get("canPullADuplicateBinaryFile").get("withDuplicateBinaryFile"));
+        Process gitWithDeletedBinaryFile = runtime.exec("git pull", null, testprojDir);
+        int exitCodeWithDeletedBinaryFile = gitWithDeletedBinaryFile.waitFor();
+        wlgb.stop();
+        assertEquals(0, exitCodeWithDeletedBinaryFile);
+        assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj"), testprojDir.toPath()));
+    }
+
     @Test
     public void canPullAModifiedNestedFile() throws IOException, GitAPIException, InterruptedException {
         MockSnapshotServer server = new MockSnapshotServer(3864, getResource("/canPullAModifiedNestedFile").toFile());
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/state.json b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/state.json
new file mode 100644
index 0000000000..9deb2e98bf
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/state.json
@@ -0,0 +1,46 @@
+[
+	{
+		"project": "testproj",
+		"getDoc": {
+			"versionID": 1,
+			"createdAt": "2014-11-30T18:40:58.123Z",
+			"email": "jdleesmiller+1@gmail.com",
+			"name": "John+1"
+		},
+		"getSavedVers": [
+        	{
+        		"versionID": 1,
+        		"comment": "added more info on doc GET and error details",
+        		"email": "jdleesmiller+1@gmail.com",
+        		"name": "John+1",
+        		"createdAt": "2014-11-30T18:47:01.456Z"
+        	}
+		],
+		"getForVers": [
+			{
+				"versionID": 1,
+				"srcs": [
+                    {
+                    	"content": "content\n",
+                    	"path": "main.tex"
+                    },
+                    {
+                    	"content": "This text is from another file.",
+                    	"path": "test.tex"
+                    }
+	            ],
+	            "atts": [
+	            	{
+	            		"url": "http://127.0.0.1:4001/base/testproj/overleaf-white-410.png",
+	            		"path": "overleaf-white-410.png"
+	            	}
+	            ]
+	        }
+		],
+		"push": "success",
+		"postback": {
+			"type": "success",
+			"versionID": 2
+		}
+	}
+]
\ No newline at end of file
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/main.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/main.tex
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/main.tex
@@ -0,0 +1 @@
+content
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/overleaf-white-410.png b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/overleaf-white-410.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a23d10c15d3eb7fcb18609be0bc4bf0706eca49
GIT binary patch
literal 8786
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

literal 0
HcmV?d00001

diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/test.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/test.tex
new file mode 100644
index 0000000000..046794f19a
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/base/testproj/test.tex
@@ -0,0 +1 @@
+This text is from another file.
\ No newline at end of file
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/state.json b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/state.json
new file mode 100644
index 0000000000..1c20b32bd6
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/state.json
@@ -0,0 +1,76 @@
+[
+	{
+		"project": "testproj",
+		"getDoc": {
+			"versionID": 2,
+			"createdAt": "2014-11-30T18:40:58.123Z",
+			"email": "jdleesmiller+1@gmail.com",
+			"name": "John+1"
+		},
+		"getSavedVers": [
+        	{
+        		"versionID": 2,
+        		"comment": "i deleted the image",
+        		"email": "jdleesmiller+1@gmail.com",
+        		"name": "John+1",
+        		"createdAt": "2014-11-30T18:48:01.123Z"
+        	},
+        	{
+        		"versionID": 1,
+        		"comment": "added more info on doc GET and error details",
+        		"email": "jdleesmiller+1@gmail.com",
+        		"name": "John+1",
+        		"createdAt": "2014-11-30T18:47:01.456Z"
+        	}
+		],
+		"getForVers": [
+			{
+				"versionID": 2,
+				"srcs": [
+                    {
+                    	"content": "content\n",
+                    	"path": "main.tex"
+                    },
+                    {
+                      "content": "This text is from another file.",
+                      "path": "test.tex"
+                    }
+	            ],
+				"atts": [
+					{
+						"url": "http://127.0.0.1:4001/withDuplicateBinaryFile/testproj/overleaf-white-410.png",
+						"path": "overleaf-white-410.png"
+					},
+					{
+						"url": "http://127.0.0.1:4001/withDuplicateBinaryFile/testproj/overleaf-white-410.png",
+						"path": "overleaf-white-410-copy.png"
+					}
+				]
+	        },
+			{
+				"versionID": 1,
+				"srcs": [
+                    {
+                    	"content": "content\n",
+                    	"path": "main.tex"
+                    },
+                    {
+                    	"content": "This text is from another file.",
+                    	"path": "test.tex"
+                    }
+	            ],
+				"atts": [
+					{
+						"url": "http://127.0.0.1:4001/withDuplicateBinaryFile/testproj/overleaf-white-410.png",
+						"path": "overleaf-white-410.png"
+					}
+				]
+	        }
+		],
+		"push": "success",
+		"postback": {
+			"type": "success",
+			"versionID": 2
+		}
+	}
+]
\ No newline at end of file
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/main.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/main.tex
new file mode 100644
index 0000000000..d95f3ad14d
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/main.tex
@@ -0,0 +1 @@
+content
diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410-copy.png b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a23d10c15d3eb7fcb18609be0bc4bf0706eca49
GIT binary patch
literal 8786
zcmXAv1z3~c_rMvW(=REluo057NlV8@cOxh;7=m<n2oe&bLvnP7bj$#xVHhAaML?8p
zk+DDi{?Gfob>rM~&OOh2pZk7JqM^PPEfqTz5fKqB9HwqeL<A_fc@Cl=ySYx_p^t8E
zBrYm?DnvxBY1CJbNpIfCp6F<)6A}I$r32NOHzkx_Fe_goA~C*yCm^U&Dd47%+z+m&
zLB2}E_#d<Ih7nT{5z!qYxVnmI(AV8pfq9S2UX3aZ<==fC2a2PkBtZgz6mh%*FS05r
zD0q`dIbQJoN{SK|7NhDe$7q`v2_*^MG6DcdDY5m$W!idoNEu+_kmD7l>HL+&#o(=h
z^X1UB^TELBt>DdX!5=~mdbR>*_OtBo^AcjwucKc_eTp`Vp2NT#WF(k=5`85CtYCZ`
zC|hpl(f89%l5P?~rraNg)n~w*S{!55qw_3od0@0L<`_DR6eb6=i5Vv~Baj_H4@eGf
zAKW_Vw=gH}ozgX8;>&=ULK~}X;{p3*Qb7LTN=eGw7ASs2dId@aI$dBfpeo-gkZA%2
zVqn(mVV)$9P6I9h_`J02J;0s;0xh=!PXgq<YV#km4?`Fd)iq4$hTG&?NWF-?{GN|&
zT0;8dl3YOyiAhz#R0si_jDvwgCe=&0v{zm}UNOn#e>JjH2nH|k-gKp#2%r<vUR~j;
z$(vC(`}rPicE>C9Q?Ji9W~P$VQL*KyM0H+ot@$8QM+`IOKPHzLTe5)r?V%O0f9>at
ze8BCHX{!2hD$NK1#%x^>LoKNCp<JdPi^OZv?8#*&Dl%LlBEXkv7zQ#n(+>3GM^YTP
zICQauq!Eb3MxQsxl5X{7#tBdDtQ*n%&nquYBrBqyM&q@wrgH$z-xU5tu4jM0#60hA
zk%IS(P6lK<-6zqzF#)PM<_GJw-`Kbhx6kcpM}G<{OhcVGC|h}I7u?c%c;goKYNxN@
z6;sJ!tPpY#eGF<`s&C{+qR;}8SpzPdr#H?;Hk8ZOs#75f&^n;qF9!1G*(ZG|8zoFy
z3jey-J4p#A#`Nf8^{<O-JUO~@PFm2FY`-sFqf=#mWxzmKOO0dWOr{Ac_&gY|j9rNM
z>WmuExwO(ho%-2ad?P-QsoqK76@~iq60HVqG_J7YfcM&B%Zq;5h#`|@zW+}I7-EbC
z(wa+Hz^#`OUT-(+se$l@#(~qP+}!`KMYC&wd%91s5tbD7nXOdR5frYC<skh?n3wtb
zPXMO|q|$-(I2FB4W-Kwt#glmwrsC0E{drI5#suDB;ezr!@$E@D|E}PtT?y3gqr#~8
zk&IMz-i%Gb{0geP1sAxS8uqLIuT@K|^Xjh#K^C2_im878{A)00n{oU;q7`k%_%SpI
z{hYR&^(!RR=U<h@oI?IPr&Tbr4&BJ`v8x_k&0gxz3*zF^lDQeRpx$W&79zVIcO8QU
zf?j{Aed+<1{(+mbPviFe$+%9T#hU>;W}b?pLA;*;;U!eKJWzDUf#8?l<79eoOfsg^
zfQ%)K8BCbM`ve3deR;YXj6|~i8k*$`B>#1#WSTNZZB`ad4v8QwW7-T(Hm6?df+b{A
z-ELIN(i&^nJnr)Y7kwzngx*)_`3>u>eDlqnTl>j2%Z)=~U&V8s!sKW!=vso`Y7Np~
zCFD;vo9wj?E+5kV8mGcRaSRX}P7OhZM4BVo_dyPvE&MH15;U$r79e$0VS@^-EQid4
zZ!@{X<OPebD92xsT(RUWlm^N%%ZyJVG!B!XKbK^0-Om1=5dit?9Oj!r?CkRpw~l#?
z3GFwot<=c@K4n@drNx6IjJe_8S?3KN+Q8&&uq!CUR+#!(6`BJ)Af9B2rsO$2=^*A<
zvqlriF2k^60HK{+IJ=qCy8s>8ZTrvm0TWsNbeSE|=z%LcLzdB58!*@IRO?cCjYh#q
zv=S?`9y;;JMbUq}fksTIqM>vooC?OyJ;c%dVN##HrX4dLk<3rf6=-=onN|953AhBb
zA>JqcOsx6$D2K>5iZwctD6nub*62O2vk?@-k1W35?uy_UQ#<=i^bF8BVL0jIKr3A8
zjofq00oY5lmwYyobRj1HCYEnbL>=7~B^{L;RUI9fx2R*Jz-u(8uE97a5-3kR1pGX0
zX?h(9y%yus3t0#L%92*W>QKHN5;;fa+UNR}p+zfd)a%M!zt35r-$-^nqkH`JXs99s
zYKnazl!@B4ubzwriGG-UlaCq{McTmmDlXK^%M;ZZ#%zn>LcV5DWPqeEXxFg1|JX#v
zpMO#IA^$c9yqsG7pAKZL{al6ZpPnfuX=0~@1n?{5f=^$dOPGI74cTIIL9~gy%!x_-
z41bi`K6BqrXtUJd+m2yk7R&0GA#!dk@Nvm{o(tv@M^*|x%BXSW{V&}w&ORkqYYujK
zo+Y2Cb|b6<P0qnt->|gxdQmFL5_GTN!=2oAsgm067npYya>N{`k8w6KB{`s~thER2
z98a?zFt})Tg~zTn0yqF^FgdR7*+~|SjO3dDO@EA`W1Fy~m>eFKE+p-LNiEdLt3IZC
zWbO!;4UB3Vf%O_};GV$?wStr1bLlzV8ejaGlK)~RyCW0b8vNjAHd8jCHm5RII&l!b
z@uV1iuGyM=GX-o;KAqn2!Y{afXRqb7-8YFkWxT!;E&4*hvJ<Y=a2V9U{(Z~<DmAg3
zHBp`Hzp`rCt-?iMj}SY26vzXci{hKydCu-^M^R+>JvX8f?Ww-_PuI9p;$ka0+uR=s
zi75b3<I7~}oGjnTohEi?E-N1}aF(tJjI7GH<92SjYjaLVSPf0l>5YB{`JLifT{+Ua
zlIA$WYp%>Xn++m*hDN4P230Wz@k(m|uV``~ic-!HZ+*P=_NBMcD|zc58w69VE99?A
z*1Kf^G_4mrQ)-xNv?+dKTKc_#{zMchYLgfe#Tq3rwX;YynEY7TMfjc>+|g?;T$-H!
zBKQf@bkf+x+MVuW(A0YkcnO(;HS;hZ(!@c{!Op>djZpSzG2pwT-ZT(FEDoIcJi)n4
zqPqFx8N?=C=Nn3qnlrupXntzv6}#}O(ApAFFIlf#!Y*Tk!|D;SJPj+QpQ8hZgF&gQ
zQeHcFz#SnCV(Kk6C98Ek(b}qbQtifDDzbaR_$xPh23P(z;9@AmW7~?kIlY6ZoBKi>
z658vu{~``4Ob4JN4LHr5hv7b;M{j}iZPNgQ6z;o$5?mnpr2V5cpIo$jG*7`ImuQWx
zB25^>!r1x1xqg#U&-PiQopLprHG0BZ=v%I|Hr-$02|{OM%|3ch`Yw_d4l%a8vus*_
z7uD2oIBDzo{i<=cW&%Zbu%VRcn9?z5L@TAgkh3fK@iFa%@>ihVcnK|BR{$A@wgcmP
zqr8Jvv09);o7ukJd(NScw#B3B(RA=kFg_^CC9P>L9&7pPk8bDI1#CN5(gM5f93Y+!
z)y8t8n#7b-Z%mA}PazC(RRoF{Jf)NxENL@uf&{FPS{<j>o%<N*87+jt>puy)tVPJR
z8e)Z3#jE)Q9^V#5dcwc39<)^n&{p2rE{i(KmEyJQK)(j+-6n{ZHoXI{*ry-u%fBhf
z&E-6GBUB149n!=3F0)#T)5yCUrrRscps3EHCJJh5?$IvL${l0{N+^FF^w8RCEm!+8
z7JYj8@u6JlUe{&L`UHEi&$?k41^fP1n}|lV%SjjSd0+mY@JBzbXm6#8g7hYWQH3a{
zFL$@oY4i=u4?<<-B~spBF!?u#-7M4xvDW<Ch8tNS^7Z8zeqKo~I@PXM@BQ>M!@dq$
z5tFtLu04=O>BIX>_2y_!R37~hM`TK{cDIdKEqi+9_7e?}bxO5I3R}Y_-3#(P07VqK
zGqnq9c>9M{#LeVcLqkLABB)H_;+{{Fk901)BUl2xhqM?s<L`ERX<A5!nu%;fapxU^
zsI#MUw7sV><DlsFKI+WXm@q`60MvE!`m~E#1BFM|@gW(TtulR(FMZCA**)^@Hv*xx
zN>8<W1q5gZN>`H>$!q#}Tdwq|!{`&pJCW-o&dopgRQ&2WCnrOg*xD)%XI`<+u3~pw
zLE#!$6e?w1629hvv%Rm2wb#a;JBEke>#LAmeEJz(gk5{TZlTtW7u!6al3atfFCsdr
zz3u~89*5tiysFa=Ux{#DVK%(BpbBH=p$^)-wodID7zq)@(K#rgNUc0bo&vhQ6kw7I
ztNk?JI9fWb%Y*EQiW1rnM1X2h^B_BZWY8PDJy$pFLLVr6h{46GFNUSMu_SkZY+Lo6
zt?@hlFi!`Wmd5;tCh^k+i-|JF){^&%_&~eXThh|s%k!!>=1IfV*S#Wyk$=2j`3QWU
zoC_4KO|hSUA+IvSudJh)bwK@YjfA^VDrSb*1Vk%ZL--vkyV~f4A7r_0A*%u0N%8I1
z))sXcnU5Zra@Wt7b4Re^cGlV(`sJg<-J;$jBP@L3AJ`hvX-u=Hfj|y)7=qvHoQP*D
z2xovnfOC&MVVBmxUu^nEp;K+%KrhR&rEZ=B3%D?AOJ)!0LU~*`_w(b|bw%ZHU!zFz
z15G8MG@H!AWKNdX1_E)GoQ2;>t6<Pw-XhDvCldE^x0!_aMFsg+L<<4N>#f2Ju(>Zz
zxJCouL&S7$8T|XEp1H5u2wWI5u$g3bS>ue(8dF}8UrLm`8;ClzBknFsNC5j00Z+Hs
z7&BdK@<qP8ub{(S45^yRGk*&g3rLHIjEekAEp`GEKE#u)Ep`xB19_gcN=2$;nPsz2
zZHivIpp`GJqbqyf?+`z$yZ<JjOLc2%#}M8Q;~s4k*MeCuO(N(H3QN+(em&@h)!D4S
z-T$HTK|7*1f5l488-GUt+|J2L{<}mb^I*%X>d2$}P9(>7RT>Z46b#!Fr|feb(255F
zGTzza`t}(j6t^VH^l4-C(0|$Jw@EimvYpJAcyEk(w@7aVp73<Wa%&W{@)VKl{F6`(
z-)u5moYJWH_50^3)<XLa_GTHwGY1|11<>D$=!_sc_yf4cd*hg~Jom#XTny96?P-EG
z?VpAf$&==MDbz30m|}8pL#;HU8@&f*M~UPSHK8<K?G}%wei-49I5196Jocrj<Wr)q
zEyIr<81ZQN%nNJy*INt2;)AIlEYAbMD{csJ@{`C1%}&Q1C|e4Jm}9=e=hRimN1G!+
z8;0U@Fuk1jXevJV7d=oh_b9wS26D%$cAD2Ic%OAhXZ*INQe#ZWc?PxExP!nWX|g=@
zS{zf62_Zm-?VAc}^}s0judru;X5VE3*kjh-wmJ@vJXf@ufOM{ZC-Ju{Xg7GH1P(XF
z!gzu!9;$Fq9ad!cIgSkW?>a8LCQWrrKqo3HK4#gYZBUxYb58psVe<}5dnoA^zL`g-
zwE0`7w*^oZ_L;+B@agX@Pj~G#IK1~$?xGZ?<kSO`Yi!<TVRnW>Nu8wT-4$ta`6Ys!
z!L%u5s;y1a)||Jo1Fo+jjw03VKAi1FY+S!L;RPS>XdHK=V}XD3`^pcgo_NP!+wSk<
zkJu-4i1~X~!{nU9m$sly^zg6JEi?5xy(5vVv?fqshs!5Jjm!Z5!}_f3+svw1dI-(V
z7sf1tn{tmhVrL!(Pa_FB;+{3I;(!-0&L$MY0OYI^2sJbLdqJCadiqJ5p;nXL)W%S0
zm!C62WqosU9&-293Llxgj2e9KYn)H}1MAVj_F?iYTdc+$&9Rnpt*VEq?p%lS?S(#u
zEW#p&D0F{pwpx$)S6GFnmHos)#F=Q&&UIdyM+KEBbZw%{v*#XrkLz|>k@<m4{9axk
zIQ-sYE_oN3fpq$*_V8&u_kLQvaJ_5Dv_-<YBp3fiMx7A5r%<2~ZoN;yas$s`nbo!|
zg*%{Gk(0&c6B-T)N<0hkGlh%0r1Wdv*H0wlj;Y+{-#MLsx)-BET+$azwD{pS#}&I+
zt=%szZ*y1pUNYU?<q&U5uhRU7S-wN|@7Ssp;2PU(d1FE)p>^f^>lSf^`FploYq{V1
zo982xL+cDuGod$&(y&=1vL2u6q^gXMd{en67Lp+${|+7DzFNH5t(&A&mn+*!*>{#0
zXSL%G)RGo7|7PJ;+h-zv7Uj<%rmZU5k~0>mFBx|GvC*21<{bK^$*HOa^Hj1-N$Q=u
z4SX;=438IoJaPfRdPi~>eKZ!OXluAmDB-@)AAF3UrKE60SdceSBwUz1D;7DEUug3d
zeBAR*sTe99Mz?-(&p+lf9R}_{m}uu!i&ML(%E!OP4Gt;OcE!{Q7I0xFA7hrx!q`?1
zB~OSI;j1Z2(H;LW#xrc1=6rtQAuGnDwU*|~Bo^ateeHyxhXzrom78$17)<ZxVH;o@
zK;1SqF96>>`=LVYakeX{Y&8G0VMY}{R0Uv_a;57fy9hR8o-!9Iw)#b=8xN13@yJwu
zv3hp%MGSkefo_u(LwT`tj|Oj^gP{sq5Y-K(MBg~w2^N&*=0d9E9zwJ7YC5#Lb51J?
zA(h<HSJ3Luu=<>g7T-*k@KFx1b!EjC(m97Lj}5>s&9{dr+`d@81?QV;D2^&34O4Jl
z{0;v)J&9s}+|O$H(3vZ;VeV`NxH`<~kcZYBRfXUvZ5Ill{SyZ7gTt2ta}1kCzxU72
z@A+)OzUGW<vi%}?1{U$bG@bZf?Xue69aN&8+`*Eiee%I+VQRCDpa9mga!T)f_799~
z#dcjIO{M2<yQJ{*_43)OZ>G2paYGO9mF}{h9ea0XPP4Zrm=($_#_RGwU4K%$@y5m(
zLVOT+8_+;f^b$hm%FGYMlP=TvGj?~+aY;bny=;LWrDLdO|7$sVFrKN=`a&f_RN^xE
zPv9Thn6={M<m2r470}BE?LELIVq2Laym3zW%QWc9n)d{Iw9kXy;rIwg+#k;I;94|(
z>8@dw1+vw<!QY9q08(pJ*2xW6txGCLRuG7up7Lj8*GQGI_P~|K|H3@q%H~}1f4qfw
zZ9D-Difay(khov%gUIfP+~)?Z%k;*NM!;6l&*M1Ao$U_9M%bR1#z<ke$avy?4;mzo
ziAy+g3|}C=p++hnjs!&#S9f&e9z<3K$i+N%qMus3=RWJSC{#ch>%^%=gtsG)+i5AO
z?x~gzw1D5l`=DDl<l^2ubMGzq;nGv!xKaw>C<u0$%g(c?Z2M68y7X?WgVEeOYuW5}
zG#YQ?o1U^RQKX~1zhC~)L4{VLaC22l$p);!_}#DzKK%TFpO0SH4+P>%=IS_-bGp2N
zg-6?JwGhJvyb6_nOc&7zdz4(=ggWzle}`@K?iHZ|->EG7?5zB8KsJ-!3;324GwbKs
z<eg!m$jAs~uIf(<Qw{KtiSmT0hSiPN_hl^eVaz}8gq}^WIzPx{He<_@Dson{4ydim
z(q?D56x`<H4^t{F#)D70E{kCyCO<qs|2cp5mX^=@(56Omf^1CY%!PT0O9q*S^s(18
z+gz`65wnRsM430&ls?P(wrFZ&=V`0}E-k+Po)<3V%w~|c_>R)tG}bxB+W7E#Ko&OA
znyEONt2pfdgJyc`t<HH`zBaRk?X($~ni|F)59KYMM2$Al1#JQc<{5%?I?~W0>ysoy
zR#b5$CObzwVf9yl$;z*BXd}bqmyXrBi`N0-cYT*h-f~7AKdG*xu%BW3;i&xe<7A1z
z&d=(d9rg>`8p8WnnUVtN%`W~jtyJLS2wdoQQ7YtV(<m<?I#tK&nqJW5c1|>l?R>42
zLB=F~z4Q$6=)Cp0MY5X+`y*<R{qVS9fs~{w9t~g5sB$)Oq)*IxZqA#v8C|L{1;N|Z
z`Fgo0Fl~)?vX*c%4PTqL%vWJ=MeH{V7Dd&^-^ZfUem?v<xmO1xsOdc)TA<P3Lq5Id
zgj)6WJIhrD`}++mj(B4<qi3#V)due7Q>UF1=S$h^NsIA%+7XCKbofE%vjHfw<k!~q
zUIrM*JMhb97=gfju{?<S?4cUErgi-CKOYNd8ku6`3-o>F%i98s#kYlmJ~<*HD>?%s
zM9<PY3RpitwKyPCJDp5J^j33&N{PJ5&@5?q$$+=BL*G5W)yb;=o{24|WGxF=z%N3W
zri^VBQ6288mqe+~o781I-lcbyJ*TOHHvO;yyK<0?eNS4~FM@FL_dNrqlk}FK=mD#_
zcXo{Gy-aYvS}?b~%w9AE9x48nAqhdc?dW;xW#vg-V?MmKOmRwoX+o#h9euJWt)$gU
zz4{zuVBAEq#=CR9eZ|85cbw-qe^GMz(CX`}&HJVTbr_B4nZ`tj7cx#{4_IXM;Lq;^
z)dkUQ?jmtbYtMx_OeK2ARfNL|TfJJOhNq6Qfw5}x?~-_V<1#*Xg)d=SYSHVHJ1(@B
z$_8((XsWjD<qtaY!!zH!*^i18usb<5^Oi*p&X#&FQv|x?Z{|&SnU@HJmgHM61Nzl0
zf275N?3@q+EDPuUSTPbCZ;hcrbTF0UW5zb2&Bb#ykU!a3cq&@d$8A&#(ow;!1JawG
z?PLS^U(ZJ>Xr!&BqF6`<b7RQ`&#_TQVq-m?GnF37ua3AW!wmjH9XJybPQLi6p!gKw
ztca`BK~uxEQSDy&YEQf<{C8zT<fo_}fy34io94#T`Zx~Kl!N;89QpWkC<&{Q$jQaN
zM&w-Hmn2`Lid}fT`=XkfB<&#eh5wuNE;+HGFqm9y_2dpcjhG_q#j+V{)eI-o^uvHm
zbx)NAFvNa`D%i70z=r9?F(_PMYtZurq<8Uko$8lB()10|J@9rGONZ1Ybdj^dXX#hL
zqAIS7^z_&|QlDp>>FxLLyJFj`>|-@;5v3eB$$}<U%lC`1x??!}Y89D6FWo^Guc`r@
zo$iWZ0n+kfbZRF$Zs?VEXWWxr%r@%!=gqEfyDK;{KY`+W?dhT;dQ0-z65X@1!M%*u
zW@;+e`M8+WY0V$Aoh2?c1OQxq^P)I40}4?KEpGm=r~|9zGB|k-xBl;9bv47!FBQLJ
zgnh{79QtHj?tFZ^FvJLZc>1G8lcO{Jq#|bU6wCGM)Z$wio4l+JHjc$mk^>g<z|r17
zu*Sp0m!*Hg$IYS-y}|ai^@DKzW45m?t?0j!x>*myL{#j|%%C1@&JFWx0`5g+_FSk4
zUZnSkw}N!bb-nLpXD@gv$1i{F)yMikPk7g#P!C#!2E-iOk;3)L9HFHTuZQ(Q9C=)R
zwCdE%4f5R#<t^K}J6rVCF9Ut9%`Sk<LZ@C&?}A?*CdUA;yfwIW^%lNp-z#_|{Huv`
zbwd<&b}oO|dOh8)G~AhlJ_UJ*Z+|ZuIm}L9iSwMl-F)W=@m%TNpfUCjD&o#I75u#3
zJ4=7g@5DD=-U2Hg<qHYpDFg<><uH?v#Pd;X&mo^yWOeRi(x%*vRHph%PNJor9=bRn
zQa%3i?Wvx=NZANmB@BG~ds(HFw9})-o-{Gq%HINzkg7hLsR}8}RNZr{f?v{j1&@@U
zok#BDc-3cepge)!R$uyFa#A+L`>IaP|940ODP&zBbb-UUJ}g}g0&_{v2h`n!*_9~P
zGX3r?VwawgUTI*b%ibDBp{za`^e-Vq+!VbYM`vQ5qPQni<|w*XC*^$IZF12wfPHfF
zv9b^TSN42AiS@;ozE>yOCMJt`>(V*DJX;H^$a{jYaLU>!(UGH&QAkp4rEv<pj^-RM
zp->P-&M*k(b9v3tcTSacXR?<nG=C^d`4gA0a{DJRoZ97XN6qjLJQbu*A>xbxNqvRM
zjjpz7*rv~0{3bgP%jepd#q!A*ijZR7IxNY49c2T0FqLJBMMelf?k9Y2l5Q8~kf5~9
zeWxCgkUwB<_?MehkwV1tKdYgF&uNd0-pfpro!t@PQilX_$=utLOd~E%!Oj+O(PCtO
zWZrVS?Nx_%0qeP`yF()ZJ!R;>QTwQw`!k%ldRopBUx=c;>m&&Bmr;y$ItexL#}0Ey
z$#qFq(Uu=O;R&typ=U?5v+-);c!y9Z<1%KUv#_O)9aVN0)o?^K;}{4(hO4>-=PY!-
zRw#qp8TU}fR!3vTUmVAdX$ku5!)cNVf7A1s2el#X6H$ELxo@0*kl|*DX{GDR-5-&j
zfeRsy84A?yo`@OdkAy%k<TAmwErO6r#ku<$d^>6lQ2oQwMSl9%)(q-eY&)Hkc~TL@
zeI&eKkS-R4i)sd3)aE~s!>!0anpKr)H+l(e=ZId>sd1ksPd&?op|52WY29NdFxLFV
zz#Ay&LcK>&z!BkkQ73;%ZPQnB(o##HGw*}h`1`H>a1Ex<PEx~ib>vjBQi_<Zd#}G&
z!P&R*;+<!J`{Fs!nPyG?b=`Z%PIdX=Rde3US4K1bX!_l2$pf$0rAvATJWAKtlh_{8
zF8)`fEaS&|_s7YzcUER%&wPC4q9>-@A)Zm#7uSIWiy7UnpL`1!&RM-jgSpJo>r>;z
zhitF{UcsZ%qNQBIz|lWL8r^x;p1@>~=sVH^roAQ?L9rKGt`7chV}z<6_u8AyqGg^1
z{z-)BZO-&fx|=id*Zx7#z5ladyBgKHomLnX`Jmn9g%jI^IQ$YUmN4;yANtK1mx(z0
z!hcHOg?AAVR1`PYkU?Y%Ym<o6Eh3xXu!R@f><S`T9SF+Rzj{JT0~YWf8(2=&6j0ej
zXfTht@?T*#wmZ%o`X_6ufp69qL~nSdXSVz5(%k5Xjgc3@0(NOt(whLgRCC6XfL6@E
zD?BRUAPG5TcHr>5UUbJUclEm=D!Ub+?d#sG4K6?fX1@*}4zUw_FG32ub)@#BZG)>a
zWP>4PT|-9tc_yB&kAiy`?7Z}LQoGW1at8oeBH3C9W)>^ZC>9}ZB0Yn&uV0$e(->H-
z!U(o?&u&7)HK^dN8uY3T<JdiW$IOZQptyfZ5Ykk4rY-Tv1EYgDn_<|C*CJ-@H@>(n
z)~_pQa9PpwJ4$-W9jW56n&LOdMw3^(Rr$KBlvCv>v^N0KH-Pcx+{>O$@X}hbO2uw{
zSH)bB<jqm#M6W(@WIA|O^k(i`oR;Aq4zc!qp6DLD#=*hZa%b}{@Fq_H@a|tO!29P1
z@Ec(F28vV(Yk0F_{FCH(ZFP;>1UmRQUgu@6%W&4@I%XQt83)VY*&%xr(D`n7#D>uY
zyx{98IOJ%Rdh8iQ%nIC_cCE9m^R^{j;8^%C*TlJh?bGY?0{h-8nduRYyFnk))=!f9
zWADpIC*AzhBYqm{+=1Hv%dk9fOoI!yy)GIh&n&VWVO3c63><otaenBCt5*bAp$~c7
z$)}&phVWPabXr8MFKlM(71~RP%s^HjIi(8~Jc>DuDEf1JV2+oHqAy&0Z3Mc(njrhH
zM}qGspS_a}S;5Ba<LH*dbxkGzAzose&ATW%6ttOCH<uN5S*mn>!(K9A)c0Od_v?kR
zg*!H7L7}O}|9G=O*<CY`2Spf@3z=-$Sa>+lMLWpsggx!1z1yz4E>;4bkPsxhg`t7-
zWOVpcIA&|y2twny^k|3M!3S_#O!uKo;juz~>~UWZ(Z%!phfE2wH$;~#qkOy4E1q~g
z%HMlhe}A~rN}t2SflMrH7>^0>zLN);bob_5y&>Lg?~|%h8LX*;SX<~M;t4O$JD6BM
t{h_t3$^No_>n35~9~8ggMtKCX*9N$sOD__eZ?Zjz;2QesO{xwt{|7pw-edp(

literal 0
HcmV?d00001

diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410.png b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/overleaf-white-410.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a23d10c15d3eb7fcb18609be0bc4bf0706eca49
GIT binary patch
literal 8786
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

literal 0
HcmV?d00001

diff --git a/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/test.tex b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/test.tex
new file mode 100644
index 0000000000..046794f19a
--- /dev/null
+++ b/services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullADuplicateBinaryFile/withDuplicateBinaryFile/testproj/test.tex
@@ -0,0 +1 @@
+This text is from another file.
\ No newline at end of file