Julian Phillips <julian@xxxxxxxxxxxxxxxxx> wrote: > > 'Error in startup script: expected version number but got "1.5.3.GIT"' > > > > followed by what I assume is a code snippet where it failed (I wouldn't > > know tcl if it hit me with a large brick). > > > > Is this expected? driver error? or maybe a bug? Bug in git-gui. *sigh* > Well, whichever it is, this seems to fix it for me ... with the proviso that I > still no nothing about tcl. I am also not sure if it is correct to do the > patch against the git repo? > > git-gui/git-gui.sh | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) Many thanks for the fix. I was about to do this myself but found your message in my inbox instead. Happy days. Fortunately git-am -3 does wonders, and it didn't matter: $ git am -s -3 jp Applying git-gui: Handle git versions of the form n.n.n.GIT error: git-gui/git-gui.sh: does not exist in index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Renamed git-gui/git-gui.sh => git-gui.sh Wrote tree 1909733645c3bd167b1b28a98ee66c0a95f357f1 Committed: 91464dfb102d6143182d8f312b68486e9dceb103 I've extolled the virtues of -3 and merge-recursive's rename detector before on the mailing list, for exactly this reason. Despite the patch coming in with the wrong path it still applies just fine. -- 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
