git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Max Kirillov <max@max630.net>
To: Paul Mackerras <paulus@ozlabs.org>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Max Kirillov <max@max630.net>, Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: [PATCH] gitk: expand $config_file_tmp before reporting to user
Date: Thu, 28 Sep 2017 07:14:17 +0300	[thread overview]
Message-ID: <20170928041417.28947-1-max@max630.net> (raw)

Tilda-based path may confise some users. First, tilda is not known
for Window users, second, it may point to unexpected location
depending on various environment setup.

Expand the path to "nativename", so that ~/.config/git/gitk-tmp
would be "C:\Users\user\.config\git\gitk-tmp", for example.
It should be less cryptic

Signed-off-by: Max Kirillov <max@max630.net>
---
 gitk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitk b/gitk
index 877d49e1de..48c1d3e714 100755
--- a/gitk
+++ b/gitk
@@ -2844,7 +2844,8 @@ proc config_check_tmp_exists {tries_left} {
 	if {$tries_left > 0} {
 	    after 100 [list config_check_tmp_exists $tries_left]
 	} else {
-	    error_popup "There appears to be a stale $config_file_tmp\
+	    error_popup "There appears to be a stale \
+ \"[file nativename $config_file_tmp]\" \
  file, which will prevent gitk from saving its configuration on exit.\
  Please remove it if it is not being used by any existing gitk process."
 	}
-- 
2.11.0.1122.gc3fec58.dirty


             reply	other threads:[~2017-09-28  4:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-28  4:14 Max Kirillov [this message]
2017-09-28  4:37 ` [PATCH] gitk: expand $config_file_tmp before reporting to user Junio C Hamano
2017-09-28  4:47   ` Junio C Hamano
2017-09-28 12:31     ` Johannes Schindelin
2017-09-28 22:03       ` Junio C Hamano
2017-09-29  4:34       ` Max Kirillov
2017-09-29 20:24   ` Uxío Prego

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=20170928041417.28947-1-max@max630.net \
    --to=max@max630.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=paulus@ozlabs.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.
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).