All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Levedahl <mlevedahl@gmail.com>
To: paulus@samba.org
Cc: git@vger.kernel.org, Mark Levedahl <mlevedahl@gmail.com>
Subject: [PATCH] gitk - restore operation of git-reset on Cygwin
Date: Thu, 22 May 2008 23:00:36 -0400	[thread overview]
Message-ID: <1211511636-3552-1-git-send-email-mlevedahl@gmail.com> (raw)

Commit 6df7403a98737 modified the call to git-reset to invoke git
directly rather than using "sh -c", but is redirecting stderr to stdout.
This does not work on Cygwin, probably because the Tcl/Tk package is
a windows program rather than Cygwin. The result is always an error
message proclaiming 'can not find channel named "1"'. This restores
invocation through sh -c.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
Note - this applies to Paul's tree, please let me know if you prefer
one that applies to Junio's instead (gitk-git/gitk rather than gitk).

 gitk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gitk b/gitk
index 22bcd18..aa70911 100755
--- a/gitk
+++ b/gitk
@@ -7617,7 +7617,7 @@ proc resethead {} {
     tkwait window $w
     if {!$confirm_ok} return
     if {[catch {set fd [open \
-	    [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
+	    [list | sh -c "git reset --$resettype $rowmenuid 2>&1"] r]} err]} {
 	error_popup $err
     } else {
 	dohidelocalchanges
--
1.5.5.1.333.gd69f4

             reply	other threads:[~2008-05-23  3:01 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-23  3:00 Mark Levedahl [this message]
2008-05-23  3:46 ` [PATCH] gitk - restore operation of git-reset on Cygwin Paul Mackerras
2008-05-23 22:26   ` Mark Levedahl
2008-05-23 23:13     ` Mark Levedahl
2008-05-23 23:17       ` Shawn O. Pearce

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1211511636-3552-1-git-send-email-mlevedahl@gmail.com \
    --to=mlevedahl@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.