Martin Koegler <mkoegler@xxxxxxxxxxxxxxxxx> wrote:
> My fault, I had only a too old GIT core (1.4.1) in my path.
> With the current version, the problem disapears.
Yea, I figured (much later) it was something like that. I still
think there is a bug in git-gui, namely not telling you that it
requires Git 1.5.x or later if it finds out the 'git' its invoking
is older than that. I'll probably patch it tonight, but it won't
ship that way in 1.5.0.
> Some notes about using git-gui:
>
> * Fetching over ssh results in an empty dialog. The password prompt is
> only shown in the terminal window, which is likly to be hidden by the
> the main window of git-gui.
This is a "feature". I only use git-gui + ssh with an ssh-agent
and public key authentication, so I never get password prompts.
Unfortunately Tcl does not permit me to setup bi-directional pipes
to a process (heck, I can't get both stdout and stderr except by
going through cat!), and even if it does, I think ssh would demand
the tty to get the password, thereby bypassing my pipe anyway.
Basically I don't know how to improve this. If someone has a bright
idea, please pass it along!
> * It there any reason, why tags are not included in the list of possible
> merge sources in Merge/Local Merge?
>
> It only needs one additional line in do_local_merge:
> set cmd [list git for-each-ref]
> lappend cmd {--format=%(objectname) %(refname)}
> lappend cmd refs/heads
> lappend cmd refs/remotes
> + lappend cmd refs/tags
> set fr_fd [open "| $cmd" r]
I just didn't consider it. The way I use git-gui for merges, I never
merge tags. But its obviously valid in plain Git. I'll add it.
--
Shawn.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html