Skip to content

Commit a319d3c

Browse files
committed
Merge pull request #21 from neel1996/critical-fix
1 parent a8bd7a2 commit a319d3c

File tree

3 files changed

+33
-18
lines changed

3 files changed

+33
-18
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
> Use any of the below options to get gitconvex for your system
1111
12-
[![gitconvex npm package](https://badgen.net/badge/gitconvex/v1.1.1/green?icon=npm)](https://www.npmjs.com/package/@itassistors/gitconvex)
13-
[![github release](https://badgen.net/badge/gitconvex/v1.1.1/blue?icon=github)](https://github.com/neel1996/gitconvex-package/releases)
14-
[![docker image](https://badgen.net/badge/gitconvex/v1.1.1/cyan?icon=docker)](https://hub.docker.com/repository/docker/itassistors/gitconvex)
12+
[![gitconvex npm package](https://badgen.net/badge/gitconvex/v1.1.0/green?icon=npm)](https://www.npmjs.com/package/@itassistors/gitconvex)
13+
[![github release](https://badgen.net/badge/gitconvex/v1.1.0/blue?icon=github)](https://github.com/neel1996/gitconvex-package/releases)
14+
[![docker image](https://badgen.net/badge/gitconvex/v1.1.0/cyan?icon=docker)](https://hub.docker.com/repository/docker/itassistors/gitconvex)
1515

1616
- Cloning repo from **github**
1717

git/gitRepoStatus.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const getGitStatus = async (repoPath) => {
5252
const multiPromise = Promise.all(
5353
localRemote &&
5454
localRemote.map(async (remote) => {
55-
console.log("LOOP ::", remote);
55+
console.log("Remote ::", remote);
5656
return await execPromised(`git remote get-url ${remote}`, {
5757
cwd: repoPath,
5858
windowsHide: true,
@@ -225,7 +225,7 @@ const getGitStatus = async (repoPath) => {
225225
}
226226
})
227227
.catch((err) => {
228-
console.log("Tracked file has been removed!");
228+
console.log("Tracked file has been removed!", err);
229229
return `${item}: DEL`;
230230
});
231231
})
@@ -261,7 +261,7 @@ const getGitStatus = async (repoPath) => {
261261
}
262262
})
263263
.catch((err) => {
264-
console.log("Tracked file has been removed!");
264+
console.log("Tracked file has been removed!", err);
265265
return "";
266266
});
267267
})

git/gitTrackedDiff.js

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,36 @@ async function getGitDiff(repoPath) {
1919
return await execPromosified(`git diff --raw`, {
2020
cwd: repoPath,
2121
windowsHide: true,
22-
}).then((res) => {
23-
const { stdout, stderr } = res;
24-
var parsedEntry = stdout.trim().split("\n");
22+
})
23+
.then((res) => {
24+
const { stdout, stderr } = res;
25+
if (stdout) {
26+
var parsedEntry = stdout.trim().split("\n");
2527

26-
var gitDifference = parsedEntry.map((entry) => {
27-
if (entry.split(/\s+/)) {
28-
let splitEntry = entry.split(/\s+/);
29-
if (splitEntry[4] && splitEntry[5]) {
30-
return "" + splitEntry[4] + "," + splitEntry[5];
31-
}
28+
var gitDifference = parsedEntry.map((entry) => {
29+
if (entry.split(/\s+/)) {
30+
let splitEntry = entry.split(/\s+/);
31+
if (splitEntry[4] && splitEntry[5]) {
32+
return (
33+
"" +
34+
splitEntry[4] +
35+
"," +
36+
splitEntry.slice(5, splitEntry.length).join(" ")
37+
);
38+
}
39+
}
40+
});
41+
42+
return gitDifference.filter((entry) => (entry ? entry : ""));
43+
} else {
44+
console.log(stderr);
45+
return [];
3246
}
47+
})
48+
.catch((err) => {
49+
console.log(err);
50+
return [];
3351
});
34-
35-
return gitDifference.filter((entry) => (entry ? entry : ""));
36-
});
3752
}
3853

3954
async function getUntrackedFiles(repoPath) {

0 commit comments

Comments
 (0)