fixes microsoft#88024

joaomoreno · joaomoreno · commit a8231df2fff6 · 2020-01-29T12:39:05.000+01:00
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -1323,6 +1323,9 @@ export class CommandCenter {
 		}
 
 		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
+		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
+		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
+		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
 
 		if (promptToSaveFilesBeforeCommit !== 'never') {
 			let documents = workspace.textDocuments
@@ -1343,17 +1346,13 @@ export class CommandCenter {
 
 				if (pick === saveAndCommit) {
 					await Promise.all(documents.map(d => d.save()));
-					await repository.add([]);
+					await repository.add(documents.map(d => d.uri));
 				} else if (pick !== commit) {
 					return false; // do not commit on cancel
 				}
 			}
 		}
 
-		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
-		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
-		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
-
 		// no changes, and the user has not configured to commit all in this case
 		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit) {
 			const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;

Original file line number	Diff line number	Diff line change
`@@ -1323,6 +1323,9 @@ export class CommandCenter {`
`1323`	`1323`	`}`
`1324`	`1324`
`1325`	`1325`	`const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;`
	`1326`	`+ const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;`
	`1327`	`+ const noStagedChanges = repository.indexGroup.resourceStates.length === 0;`
	`1328`	`+ const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;`
`1326`	`1329`
`1327`	`1330`	`if (promptToSaveFilesBeforeCommit !== 'never') {`
`1328`	`1331`	`let documents = workspace.textDocuments`
`@@ -1343,17 +1346,13 @@ export class CommandCenter {`
`1343`	`1346`
`1344`	`1347`	`if (pick === saveAndCommit) {`
`1345`	`1348`	`await Promise.all(documents.map(d => d.save()));`
`1346`		`- await repository.add([]);`
	`1349`	`+ await repository.add(documents.map(d => d.uri));`
`1347`	`1350`	`} else if (pick !== commit) {`
`1348`	`1351`	`return false; // do not commit on cancel`
`1349`	`1352`	`}`
`1350`	`1353`	`}`
`1351`	`1354`	`}`
`1352`	`1355`
`1353`		`- const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;`
`1354`		`- const noStagedChanges = repository.indexGroup.resourceStates.length === 0;`
`1355`		`- const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;`
`1356`		`-`
`1357`	`1356`	`// no changes, and the user has not configured to commit all in this case`
`1358`	`1357`	`if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit) {`
`1359`	`1358`	`const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;`