[gitg] Fixed arguments passed to log for first arg
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Fixed arguments passed to log for first arg
- Date: Fri, 19 Aug 2011 20:18:30 +0000 (UTC)
commit b3deb75f31c63cb37ae8ad5d7dc72486f454a89c
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date: Fri Aug 19 22:18:22 2011 +0200
Fixed arguments passed to log for first arg
gitg/gitg-window.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 21c1e71..fa30e52 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -1916,10 +1916,16 @@ gitg_window_load_repository (GitgWindow *window,
}
static GFile *
-find_dot_git (GFile *location)
+find_dot_git (GFile *location,
+ gboolean *from_first)
{
location = g_file_dup (location);
+ if (from_first)
+ {
+ *from_first = TRUE;
+ }
+
do
{
GFile *tmp;
@@ -1936,6 +1942,11 @@ find_dot_git (GFile *location)
break;
}
+ if (from_first)
+ {
+ *from_first = FALSE;
+ }
+
g_object_unref (tmp);
tmp = g_file_get_parent (location);
@@ -1965,13 +1976,14 @@ load_repository_for_command_line (GitgWindow *window,
gchar *work_tree_path = NULL;
gchar *activatable = NULL;
gchar *action = NULL;
+ gboolean from_first;
first_arg = g_file_new_for_commandline_arg (argv[0]);
uri = g_file_get_uri (first_arg);
if (!gitg_uri_parse (uri, &work_tree_path, &sel, &activatable, &action))
{
- git_dir = find_dot_git (first_arg);
+ git_dir = find_dot_git (first_arg, &from_first);
}
else
{
@@ -1984,7 +1996,7 @@ load_repository_for_command_line (GitgWindow *window,
{
gint offset;
- if (git_dir && !g_file_equal (git_dir, first_arg))
+ if (git_dir && !from_first)
{
offset = 0;
}
@@ -2019,7 +2031,7 @@ load_repository_for_command_line (GitgWindow *window,
gchar *cwd = g_get_current_dir ();
GFile *file = g_file_new_for_path (cwd);
- git_dir = find_dot_git (file);
+ git_dir = find_dot_git (file, NULL);
g_free (cwd);
g_object_unref (file);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]