Skip to content

Fix stageLines - #906

Merged
johnhaley81 merged 2 commits into
masterfrom
fix-stage-lines
Feb 16, 2016
Merged

Fix stageLines#906
johnhaley81 merged 2 commits into
masterfrom
fix-stage-lines

Conversation

@joshaber

Copy link
Copy Markdown
Collaborator

There were a couple funny things:

  1. Removing the index lock seems out of place for this function.
  2. We should calculate the diff after refreshing the index.

Comment thread lib/repository.js

var indexLock = repo.path().replace(".git/", "") + ".git/index.lock";

return fse.remove(indexLock)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

👍

@johnhaley81

Copy link
Copy Markdown
Collaborator

LGTM. Gracias amigo.

johnhaley81 added a commit that referenced this pull request Feb 16, 2016
@johnhaley81
johnhaley81 merged commit 895d5e6 into master Feb 16, 2016
@johnhaley81
johnhaley81 deleted the fix-stage-lines branch February 16, 2016 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants