fixes microsoft#90934

joaomoreno · joaomoreno · commit 96dfec43ee7e · 2020-02-27T09:58:06.000+01:00
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -1397,12 +1397,16 @@ export class CommandCenter {
 			opts.signoff = true;
 		}
 
+		const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges');
+
 		if (
 			(
 				// no changes
 				(noStagedChanges && noUnstagedChanges)
 				// or no staged changes and not `all`
 				|| (!opts.all && noStagedChanges)
+				// no staged changes and no tracked unstaged changes
+				|| (noStagedChanges && smartCommitChanges === 'tracked' && repository.workingTreeGroup.resourceStates.every(r => r.type === Status.UNTRACKED))
 			)
 			&& !opts.empty
 		) {
@@ -1416,7 +1420,7 @@ export class CommandCenter {
 			return false;
 		}
 
-		if (opts.all && config.get<'all' | 'tracked'>('smartCommitChanges') === 'tracked') {
+		if (opts.all && smartCommitChanges === 'tracked') {
 			opts.all = 'tracked';
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1397,12 +1397,16 @@ export class CommandCenter {`
`1397`	`1397`	`opts.signoff = true;`
`1398`	`1398`	`}`
`1399`	`1399`
	`1400`	`+ const smartCommitChanges = config.get<'all' \| 'tracked'>('smartCommitChanges');`
	`1401`	`+`
`1400`	`1402`	`if (`
`1401`	`1403`	`(`
`1402`	`1404`	`// no changes`
`1403`	`1405`	`(noStagedChanges && noUnstagedChanges)`
`1404`	`1406`	// or no staged changes and not `all`
`1405`	`1407`	`\|\| (!opts.all && noStagedChanges)`
	`1408`	`+ // no staged changes and no tracked unstaged changes`
	`1409`	`+ \|\| (noStagedChanges && smartCommitChanges === 'tracked' && repository.workingTreeGroup.resourceStates.every(r => r.type === Status.UNTRACKED))`
`1406`	`1410`	`)`
`1407`	`1411`	`&& !opts.empty`
`1408`	`1412`	`) {`
`@@ -1416,7 +1420,7 @@ export class CommandCenter {`
`1416`	`1420`	`return false;`
`1417`	`1421`	`}`
`1418`	`1422`
`1419`		`- if (opts.all && config.get<'all' \| 'tracked'>('smartCommitChanges') === 'tracked') {`
	`1423`	`+ if (opts.all && smartCommitChanges === 'tracked') {`
`1420`	`1424`	`opts.all = 'tracked';`
`1421`	`1425`	`}`
`1422`	`1426`