Skip to content

Commit

Permalink
Update #239 for master after merge of #2
Browse files Browse the repository at this point in the history
  • Loading branch information
rowanj committed Sep 20, 2013
1 parent b09224b commit 9588379
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions Classes/git/PBGitStash.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,9 @@ -(id)initWithRepository:(PBGitRepository *)repo stashOID:(git_oid)stash_id index
GTCommit * gtIndexCommit = [parents objectAtIndex:1];
GTCommit * gtAncestorCommit = [parents objectAtIndex:0];

PBGitSHA * sha = [PBGitSHA shaWithOID:stash_id];
PBGitSHA * indexSha = [PBGitSHA shaWithOID:*git_object_id(gtIndexCommit.git_object)];
PBGitSHA * ancestorSha = [PBGitSHA shaWithOID:*git_object_id(gtAncestorCommit.git_object)];

_commit = [PBGitCommit commitWithRepository:repo andSha:sha];
_indexCommit = [PBGitCommit commitWithRepository:repo andSha:indexSha];
_ancesterCommit = [PBGitCommit commitWithRepository:repo andSha:ancestorSha];
_commit = [[PBGitCommit alloc] initWithRepository:repo andCommit:gtCommit];
_indexCommit = [[PBGitCommit alloc] initWithRepository:repo andCommit:gtIndexCommit];
_ancesterCommit = [[PBGitCommit alloc] initWithRepository:repo andCommit:gtAncestorCommit];

//NSLog(@" stash: %zd, %@, %@, %@",_index,[_commit shortName], [_ancesterCommit shortName], [_indexCommit shortName]);
return self;
Expand Down

0 comments on commit 9588379

Please sign in to comment.