Permalink
Browse files

Merge branch 'stable'

* stable:
  PBGitConfig: Add missing sentinel
  Remove use of deprecated stringWithCString
  HistoryView: only add parents if parents array exists
  keyboardNavigation: Fix keys 'c' and 'v' from webView
  Site: add link to Twitter

Conflicts:
	Site/text/contact.markdown
  • Loading branch information...
2 parents fa6ff44 + 69759e7 commit 6fd339756e609a9a6415aaffba2c419824f5860c Pieter de Bie committed Jun 20, 2009
Showing with 13 additions and 8 deletions.
  1. +1 −1 PBGitBinary.m
  2. +1 −1 PBGitConfig.m
  3. +1 −1 Site/templates/site.html
  4. +3 −1 Site/text/contact.markdown
  5. +1 −1 gitx.m
  6. +6 −3 html/views/history/history.js
View
@@ -66,7 +66,7 @@ + (void) initialize
// Try to find the path of the Git binary
char* path = getenv("GIT_PATH");
- if (path && [self acceptBinary:[NSString stringWithCString:path]])
+ if (path && [self acceptBinary:[NSString stringWithUTF8String:path]])
return;
// No explicit path. Try it with "which"
View
@@ -79,7 +79,7 @@ - (void) setValue:(id)value forKeyPath:(NSString *)path
// Check if it exists globally. In that case, write it as a global
- NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path];
+ NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path, nil];
int ret;
[PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:arguments inDir:nil retValue:&ret];
if (!ret) // It exists globally
@@ -40,7 +40,7 @@
<%= @body %>
</div>
<div id="footer">
- © Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
+ © Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> (<a href="http://twitter.com/pdebie">@pdebie</a>) is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
</div>
</div>
<script type="text/javascript">
@@ -4,4 +4,6 @@ Contact
The GitX repository can be found on Github at [http://github.com/pieter/gitx](http://www.github.com/pieter/gitx/wikis).
-GitX has a mailing list at [gitx@googlegroups.com](mailto:gitx@googlegroups.com) to which you can email any questions or patches. GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com).
+GitX has a mailing list at [gitx@googlegroups.com](mailto:gitx@googlegroups.com) to which you can email any questions or patches.
+
+GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com) or on twitter <a href="http://twitter.com/pdebie">@pdebie</a>
View
@@ -133,7 +133,7 @@ int main(int argc, const char** argv)
NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:argc];
int i = 0;
for (i = 0; i < argc; i++)
- [arguments addObject: [NSString stringWithCString:argv[i]]];
+ [arguments addObject: [NSString stringWithUTF8String:argv[i]]];
if (!isatty(STDIN_FILENO) && fdopen(STDIN_FILENO, "r"))
handleSTDINDiff(proxy);
@@ -184,15 +184,18 @@ var loadCommit = function(commitObject, currentRef) {
}
}
+ // Scroll to top
+ scroll(0, 0);
+
+ if (!commit.parents)
+ return;
+
for (var i = 0; i < commit.parents.length; i++) {
var newRow = $("commit_header").insertRow(-1);
newRow.innerHTML = "<td class='property_name'>Parent:</td><td>" +
"<a href='' onclick='selectCommit(this.innerHTML); return false;'>" +
commit.parents[i] + "</a></td>";
}
-
- // Scroll to top
- scroll(0, 0);
}
var showDiff = function() {

0 comments on commit 6fd3397

Please sign in to comment.