Skip to content

Check for existence to avoid throwing an error when there is no default signature #577

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
johnhaley81 merged 3 commits into from
May 20, 2015
Merged

Check for existence to avoid throwing an error when there is no default signature #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f93ffae
If there is no default signature then this code was throwing.
May 18, 2015
b06338d
Fix existing test that should have detected the null default signatur…
May 19, 2015
17c5547
Fix indentation
May 19, 2015
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 lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ Repository.prototype.treeBuilder = function() {
Repository.prototype.defaultSignature = function() {
var result = NodeGit.Signature.default(this);

if (!result.name()) {
if (!result || !result.name()) {
result = NodeGit.Signature.now("unknown", "unknown@unknown.com");
}

Expand Down
15 changes: 5 additions & 10 deletions test/tests/signature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,14 @@ describe("Signature", function() {
assert.equal(when.offset(), -now.getTimezoneOffset());
});

it("can get a default signature when no user name is set", function() {
it("can get a default signature when no user name is set", function(done) {
var savedUserName;
var savedUserEmail;

var cleanUp = function() {
return exec("git config --global user.name \"" + savedUserName + "\"")
.then(function() {
return exec(
"git config --global user.email \"" +
savedUserEmail +
"\"");
exec("git config --global user.email \"" + savedUserEmail + "\"");
});
};

Expand All @@ -78,17 +75,15 @@ describe("Signature", function() {
})
.then(function(repo) {
var sig = repo.defaultSignature();

assert.equal(sig.name(), "unknown");
assert.equal(sig.email(), "unknown@unknown.com");

})
.then(function() {
cleanUp();
})
.then(cleanUp)
.then(done)
.catch(function(e) {
cleanUp()
.then(function() {
done(e);
return Promise.reject(e);
});
});
Expand Down