Skip to content

Commit 4205333

Browse files
committed
Merge pull request brotherbard#54 from RomainMuller/fix
GitX 0.8.2 does not like first commits
2 parents fb6abc7 + e546078 commit 4205333

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

GLFileView.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ - (void)closeView
242242

243243
+ (NSString *) escapeHTML:(NSString *)txt
244244
{
245+
if (txt == nil)
246+
return txt;
245247
NSMutableString *newTxt = [NSMutableString stringWithString:txt];
246248
[newTxt replaceOccurrencesOfString:@"&" withString:@"&" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
247249
[newTxt replaceOccurrencesOfString:@"<" withString:@"&lt;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];

PBWebHistoryController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ - (void)commitDetailsLoaded:(NSNotification *)notification
107107
NSMutableDictionary *stats=[self parseStats:details];
108108

109109
// File list
110-
NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]];
110+
NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]];
111111
NSString *fileList=[GLFileView parseDiffTree:dt withStats:stats];
112112

113113
// Diffs list
114-
NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]];
114+
NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]];
115115
NSString *diffs=[GLFileView parseDiff:d];
116116

117117
NSString *html=[NSString stringWithFormat:@"%@%@<div id='diffs'>%@</div>",header,fileList,diffs];

0 commit comments

Comments
 (0)