diff --git a/package-lock.json b/package-lock.json index 2fb512c..4b3bea4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gitstash", - "version": "5.1.0", + "version": "5.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "gitstash", - "version": "5.1.0", + "version": "5.2.0", "license": "MIT", "dependencies": { "tmp": "0.2.1" diff --git a/src/Git/StashGit.ts b/src/Git/StashGit.ts index f850ddd..bb62f7d 100644 --- a/src/Git/StashGit.ts +++ b/src/Git/StashGit.ts @@ -51,13 +51,13 @@ export default class StashGit extends Git { const params = [ 'stash', 'list', - '--format="%ci %h %s"', + '--format="%ci %h %gs"', ] const stashList = (await this.exec(params, cwd)).trim() const sep1 = 26 // date length - const sep2 = 34 // date length + (1) space + (7) hash length + const sep2 = 32 // date length + (1) space + (7) hash length const list: Stash[] = !stashList.length ? [] : stashList .split(/\r?\n/g) diff --git a/src/StashCommands.ts b/src/StashCommands.ts index 5e7b155..248c530 100644 --- a/src/StashCommands.ts +++ b/src/StashCommands.ts @@ -257,7 +257,9 @@ export class StashCommands { this.performLogging(params, result, node) - this.showNotification(notificationText || result, type) + if (notificationText !== 'Stash dropped') { + this.showNotification(notificationText || result, type) + } } /** diff --git a/src/StashLabels.ts b/src/StashLabels.ts index 003665c..80e42cd 100644 --- a/src/StashLabels.ts +++ b/src/StashLabels.ts @@ -112,7 +112,7 @@ export default class { private parseStashLabel(stashNode: StashNode, template: string): string { return template .replace('${index}', stashNode.index.toString()) - .replace('${branch}', this.getStashBranch(stashNode)) + .replace('${branch}, ', '') .replace('${description}', this.getStashDescription(stashNode)) .replace('${dateTimeLong}', DateFormat.toFullyReadable(new Date(Date.parse(stashNode.date)))) .replace('${dateTimeSmall}', DateFormat.toDateTimeSmall(new Date(Date.parse(stashNode.date))))