Skip to content

Commit 369a555

Browse files
authored
Merge pull request #2 from ssp/master
small changes
2 parents 64045a9 + 8ccc5e3 commit 369a555

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

Classes/Util/GitXCommitCopier.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ + (NSString *) toPatch:(NSArray<PBGitCommit *> *)commits {
5555
+ (NSArray<NSString *> *) transformCommits:(NSArray<PBGitCommit *> *)commits with:(NSString *(^)(PBGitCommit * commit))transformer {
5656

5757
NSMutableArray *strings = [NSMutableArray arrayWithCapacity:commits.count];
58-
[commits enumerateObjectsUsingBlock:^(PBGitCommit * _Nonnull commit, NSUInteger idx, BOOL * _Nonnull stop) {
58+
[commits enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(PBGitCommit * _Nonnull commit, NSUInteger idx, BOOL * _Nonnull stop) {
5959
[strings addObject:transformer(commit)];
6060
}];
6161

Classes/git/PBGitIndex.m

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ - (BOOL)performStageOrUnstage:(BOOL)stage withFiles:(NSArray *)files
389389
if (loopTo > filesCount)
390390
loopTo = filesCount;
391391
int loopCount = 0;
392-
int i = 0;
393392

394393
// Staging
395394
while (loopCount < filesCount) {
@@ -399,7 +398,7 @@ - (BOOL)performStageOrUnstage:(BOOL)stage withFiles:(NSArray *)files
399398
// "git add -- <files>
400399
NSMutableString *input = [NSMutableString string];
401400

402-
for (i = loopFrom; i < loopTo; i++) {
401+
for (int i = loopFrom; i < loopTo; i++) {
403402
loopCount++;
404403

405404
PBChangedFile *file = [files objectAtIndex:i];
@@ -418,7 +417,6 @@ - (BOOL)performStageOrUnstage:(BOOL)stage withFiles:(NSArray *)files
418417
}
419418
}
420419

421-
422420
int ret = 1;
423421
if (stage) {
424422
[self.repository outputForArguments:[NSArray arrayWithObjects:@"update-index", @"--add", @"--remove", @"-z", @"--stdin", nil]
@@ -435,16 +433,10 @@ - (BOOL)performStageOrUnstage:(BOOL)stage withFiles:(NSArray *)files
435433
return NO;
436434
}
437435

438-
for (i = loopFrom; i < loopTo; i++) {
436+
for (int i = loopFrom; i < loopTo; i++) {
439437
PBChangedFile *file = [files objectAtIndex:i];
440-
441-
if (stage) {
442-
file.hasUnstagedChanges = NO;
443-
file.hasStagedChanges = YES;
444-
} else {
445-
file.hasUnstagedChanges = YES;
446-
file.hasStagedChanges = NO;
447-
}
438+
file.hasStagedChanges = stage;
439+
file.hasUnstagedChanges = !stage;
448440
}
449441

450442
// Prepare next iteration
@@ -453,6 +445,9 @@ - (BOOL)performStageOrUnstage:(BOOL)stage withFiles:(NSArray *)files
453445
if (loopTo > filesCount)
454446
loopTo = filesCount;
455447
}
448+
449+
[self postIndexChange];
450+
456451
return YES;
457452
}
458453

English.lproj/MainMenu.xib

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@
169169
<action selector="copy:" target="-1" id="181"/>
170170
</connections>
171171
</menuItem>
172-
<menuItem title="Copy SHA" alternate="YES" keyEquivalent="c" id="964">
172+
<menuItem title="Copy short SHA" alternate="YES" keyEquivalent="c" id="Q6u-9U-Mue">
173173
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
174174
<connections>
175-
<action selector="copySHA:" target="-1" id="966"/>
175+
<action selector="copyShortName:" target="-1" id="feT-ND-ZxS"/>
176176
</connections>
177177
</menuItem>
178-
<menuItem title="Copy short SHA" alternate="YES" keyEquivalent="C" id="Q6u-9U-Mue">
178+
<menuItem title="Copy full SHA" alternate="YES" keyEquivalent="C" id="964">
179179
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
180180
<connections>
181-
<action selector="copyShortName:" target="-1" id="feT-ND-ZxS"/>
181+
<action selector="copySHA:" target="-1" id="966"/>
182182
</connections>
183183
</menuItem>
184184
<menuItem title="Copy Patch" alternate="YES" keyEquivalent="c" id="ZiX-Nf-qba">

0 commit comments

Comments
 (0)