[PATCH] gitk - restore operation of git-reset on Cygwin
- From
Mark Levedahl <mlevedahl@gmail.com>
- Date
- May 23, 2008, 03:00 UTC
- Message-ID
- <1211511636-3552-1-git-send-email-mlevedahl@gmail.com>
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