From b37e04c9c8b077fc22a91a49514785091ec7efc7 Mon Sep 17 00:00:00 2001 From: Sly Bouhafs Date: Sat, 7 Oct 2023 18:44:06 +0100 Subject: [PATCH 1/3] Fix Deleted files --- src/util/git.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/git.ts b/src/util/git.ts index fedc3b8..4a66f40 100644 --- a/src/util/git.ts +++ b/src/util/git.ts @@ -134,6 +134,7 @@ export const getDiffAgainstMaster = async ( const changedFilesString = await git.diff([ `master..${current}`, + '--diff-filter=d', '--name-only', ...ignoreFileOptions, ]) @@ -149,7 +150,7 @@ export const getDiffAgainstMaster = async ( const [display, db] = await Promise.all([ git.diff([`--color`, `master..${current}`, ...ignoreFileOptions]), - git.diff([`master..${current}`, ...ignoreFileOptions]), + git.diff([`master..${current}`, '--diff-filter=d', ...ignoreFileOptions]), ]) return { From f86ade68bd0aefd59597b8b2196fb5deea92aefb Mon Sep 17 00:00:00 2001 From: Sly Bouhafs Date: Sat, 7 Oct 2023 18:50:42 +0100 Subject: [PATCH 2/3] Update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebd90aa..b8e7421 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "c0d3", - "version": "2.3.4", + "version": "2.3.5", "description": "Command Line Interface (CLI) for c0d3.com", "license": "MIT", "homepage": "https://c0d3.com", From 7e18cf6da059bffb44c9643ef03eaac0d6d656ee Mon Sep 17 00:00:00 2001 From: Sly Bouhafs Date: Sat, 7 Oct 2023 18:58:13 +0100 Subject: [PATCH 3/3] Fix display diff --- src/util/git.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/git.ts b/src/util/git.ts index 4a66f40..09e9592 100644 --- a/src/util/git.ts +++ b/src/util/git.ts @@ -149,7 +149,12 @@ export const getDiffAgainstMaster = async ( validateFiles(changedFilesString, lessonOrder, challengeOrder.toString()) const [display, db] = await Promise.all([ - git.diff([`--color`, `master..${current}`, ...ignoreFileOptions]), + git.diff([ + `--color`, + `master..${current}`, + '--diff-filter=d', + ...ignoreFileOptions, + ]), git.diff([`master..${current}`, '--diff-filter=d', ...ignoreFileOptions]), ])