Skip to content

fix(cli): Make gz -a working again #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2018
Merged

fix(cli): Make gz -a working again #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/commitizen/staging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export { isClean };
* Asynchrounously determines if the staging area is clean
*/
function isClean (repoPath, done) {
exec('git diff --cached --name-only', {
exec('git diff --no-ext-diff --name-only && git diff --no-ext-diff --cached --name-only', {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could git diff-index --quiet HEAD work? 🤔 That way we only have to execute git once.

ref: https://unix.stackexchange.com/a/394674

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LinusU The problem is that HEAD points to a commit/branch.
So, before your first commit, you will get a fatal: bad revision 'HEAD'.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right, looks good then 👍 thanks for checking!

maxBuffer: Infinity,
cwd: repoPath || process.cwd()
}, function (error, stdout) {
Expand Down
15 changes: 13 additions & 2 deletions test/tests/staging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,20 @@ describe('staging', function () {
staging.isClean(repoConfig.path, function (afterWriteStagingIsCleanError, afterWriteStagingIsClean) {
expect(afterWriteStagingIsCleanError).to.be.null;
expect(afterWriteStagingIsClean).to.be.false;
done();
});

writeFilesToPath({
dummymodified: {
contents: repoConfig.files.dummyfile.contents + '-modified',
filename: repoConfig.files.dummyfile.filename,
}
}, repoConfig.path);

staging.isClean(repoConfig.path, function (afterWriteStagingIsCleanError, afterWriteStagingIsClean) {
expect(afterWriteStagingIsCleanError).to.be.null;
expect(afterWriteStagingIsClean).to.be.false;
done();
});
});
});
});
});
Expand Down