Skip to content

Commit a640c6e

Browse files
Merge branch 'main' into fix-empty-index
2 parents e7a6ac1 + 16214e3 commit a640c6e

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

src/Gitonomy/Git/Parser/DiffParser.php

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ protected function doParse()
5555
$newMode = $this->consumeTo("\n");
5656
$this->consumeNewLine();
5757
$oldMode = null;
58+
$oldName = '/dev/null';
5859
}
5960
if ($this->expects('old mode ')) {
6061
$oldMode = $this->consumeTo("\n");
@@ -66,6 +67,7 @@ protected function doParse()
6667
if ($this->expects('deleted file mode ')) {
6768
$oldMode = $this->consumeTo("\n");
6869
$newMode = null;
70+
$newName = '/dev/null';
6971
$this->consumeNewLine();
7072
}
7173

tests/Gitonomy/Git/Tests/DiffTest.php

+22
Original file line numberDiff line numberDiff line change
@@ -259,4 +259,26 @@ public function testThrowErrorOnBlobGetWithoutIndex()
259259
$this->assertSame('', $file->getOldIndex());
260260
$this->assertSame('', $file->getNewIndex());
261261
}
262+
263+
public function testEmptyNewFile()
264+
{
265+
$diff = Diff::parse("diff --git a/test b/test\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\n");
266+
$firstFile = $diff->getFiles()[0];
267+
268+
$this->assertTrue($firstFile->isCreation());
269+
$this->assertFalse($firstFile->isDeletion());
270+
$this->assertSame('test', $firstFile->getNewName());
271+
$this->assertNull($firstFile->getOldName());
272+
}
273+
274+
public function testEmptyOldFile()
275+
{
276+
$diff = Diff::parse("diff --git a/test b/test\ndeleted file mode 100644\nindex e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000\n");
277+
$firstFile = $diff->getFiles()[0];
278+
279+
$this->assertFalse($firstFile->isCreation());
280+
$this->assertTrue($firstFile->isDeletion());
281+
$this->assertNull($firstFile->getNewName());
282+
$this->assertSame('test', $firstFile->getOldName());
283+
}
262284
}

0 commit comments

Comments
 (0)