From: Orgad Shaneh <orgads@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Pratyush Yadav <me@yadavpratyush.com>,
git@vger.kernel.org,
Orgad Shaneh via GitGitGadget <gitgitgadget@gmail.com>
Subject: Re: [PATCH] git-gui: fix inability to quit after closing another instance
Date: Sun, 21 Apr 2024 00:58:18 +0300 [thread overview]
Message-ID: <CAGHpTBKy9ABmHk32yKsj1C9d=OLZqSU8=ApduvpmyWqSAUjMQA@mail.gmail.com> (raw)
In-Reply-To: <xmqqy1ph1esd.fsf@gitster.g>
Hi Junio/Yadav,
It's been more than a year since I opened a PR to git-gui upstream
(https://github.com/prati0100/git-gui/pull/91). I pinged several
times, but it looks like nobody's home.
Is it possible to accept it to git nevertheless? This is an annoying
issue, and the fix is trivial.
Thanks!
- Orgad
On Wed, Feb 1, 2023 at 7:22 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Orgad, thanks for a patch.
> Yadav, this came to git@vger.kernel.org, so I'm forwarding.
>
> cf. Documentation/SubmittingPatches
>
> == Subsystems with dedicated maintainers
>
> Some parts of the system have dedicated maintainers with their own
> repositories.
>
> - `git-gui/` comes from git-gui project, maintained by Pratyush Yadav:
>
> https://github.com/prati0100/git-gui.git
>
> "Orgad Shaneh via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Orgad Shaneh <orgads@gmail.com>
> >
> > If you open 2 git gui instances in the same directory, then close one
> > of them and try to close the other, an error message pops up, saying:
> > 'error renaming ".git/GITGUI_BCK": no such file or directory', and it
> > is no longer possible to close the window ever.
> >
> > Fix by catching this error, and proceeding even if the file no longer
> > exists.
> >
> > Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> > ---
> > git-gui: fix inability to quit after closing another instance
> >
> > If you open 2 git gui instances in the same directory, then close one of
> > them and try to close the other, an error message pops up, saying:
> > 'error renaming ".git/GITGUI_BCK": no such file or directory', and it is
> > no longer possible to close the window ever.
> >
> > Fix by catching this error, and proceeding even if the file no longer
> > exists.
> >
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1446%2Forgads%2Fgit-gui-no-quit-v1
> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1446/orgads/git-gui-no-quit-v1
> > Pull-Request: https://github.com/git/git/pull/1446
> >
> > git-gui/git-gui.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> > index 201524c34ed..b00ee691e3b 100755
> > --- a/git-gui/git-gui.sh
> > +++ b/git-gui/git-gui.sh
> > @@ -2307,7 +2307,7 @@ proc do_quit {{rc {1}}} {
> > #
> > set save [gitdir GITGUI_MSG]
> > if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
> > - file rename -force [gitdir GITGUI_BCK] $save
> > + catch { file rename -force [gitdir GITGUI_BCK] $save }
> > set GITGUI_BCK_exists 0
> > } elseif {[$ui_comm edit modified]} {
> > set msg [string trim [$ui_comm get 0.0 end]]
> >
> > base-commit: 2fc9e9ca3c7505bc60069f11e7ef09b1aeeee473
prev parent reply other threads:[~2024-04-20 21:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 8:26 [PATCH] git-gui: fix inability to quit after closing another instance Orgad Shaneh via GitGitGadget
2023-02-01 17:22 ` Junio C Hamano
2024-04-20 21:58 ` Orgad Shaneh [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGHpTBKy9ABmHk32yKsj1C9d=OLZqSU8=ApduvpmyWqSAUjMQA@mail.gmail.com' \
--to=orgads@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@yadavpratyush.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).