From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Sitaram Chamarty <sitaramc@gmail.com>,
John Arthorne <arthorne.eclipse@gmail.com>,
git <git@vger.kernel.org>
Subject: Re: receive.denyNonNonFastForwards not denying force update
Date: Tue, 21 Aug 2012 14:52:02 -0700 [thread overview]
Message-ID: <7va9xndibh.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7v628cfb6h.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 21 Aug 2012 09:43:18 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Modulo the above "you might want to turn the call to warn() to
> another helper that can be used from elsewhere", this patch looks
> perfect to me.
And that "modulo" is fairly simple if we wanted to go that route.
attr.c | 2 +-
dir.c | 2 +-
git-compat-util.h | 3 +++
wrapper.c | 7 ++++++-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git c/attr.c w/attr.c
index cab01b8..f12c83f 100644
--- c/attr.c
+++ w/attr.c
@@ -354,7 +354,7 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
if (!fp) {
if (errno != ENOENT)
- warning(_("unable to access '%s': %s"), path, strerror(errno));
+ warn_on_inaccessible(path);
return NULL;
}
res = xcalloc(1, sizeof(*res));
diff --git c/dir.c w/dir.c
index ea74048..4868339 100644
--- c/dir.c
+++ w/dir.c
@@ -398,7 +398,7 @@ int add_excludes_from_file_to_list(const char *fname,
fd = open(fname, O_RDONLY);
if (fd < 0 || fstat(fd, &st) < 0) {
if (errno != ENOENT)
- warning(_("unable to access '%s': %s"), fname, strerror(errno));
+ warn_on_inaccessible(fname);
if (0 <= fd)
close(fd);
if (!check_index ||
diff --git c/git-compat-util.h w/git-compat-util.h
index 5a520e2..000042d 100644
--- c/git-compat-util.h
+++ w/git-compat-util.h
@@ -607,6 +607,9 @@ int remove_or_warn(unsigned int mode, const char *path);
/* Call access(2), but warn for any error besides ENOENT. */
int access_or_warn(const char *path, int mode);
+/* Warn on an inaccessible file that ought to be accessible */
+void warn_on_inaccessible(const char *path);
+
/* Get the passwd entry for the UID of the current process. */
struct passwd *xgetpwuid_self(void);
diff --git c/wrapper.c w/wrapper.c
index b40c7e7..68739aa 100644
--- c/wrapper.c
+++ w/wrapper.c
@@ -403,11 +403,16 @@ int remove_or_warn(unsigned int mode, const char *file)
return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file);
}
+void warn_on_inaccessible(const char *path)
+{
+ warning(_("unable to access '%s': %s"), path, strerror(errno));
+}
+
int access_or_warn(const char *path, int mode)
{
int ret = access(path, mode);
if (ret && errno != ENOENT)
- warning(_("unable to access '%s': %s"), path, strerror(errno));
+ warn_on_inaccessible(path);
return ret;
}
next prev parent reply other threads:[~2012-08-21 21:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAHgXSop42qWcAEGn6=og8Pistv_Jrwhgcnv3B_ORVtSMi1fCHA@mail.gmail.com>
2012-08-20 13:33 ` receive.denyNonNonFastForwards not denying force update John Arthorne
2012-08-20 17:05 ` Junio C Hamano
2012-08-21 0:52 ` Sitaram Chamarty
2012-08-21 1:22 ` Junio C Hamano
2012-08-21 1:53 ` Brandon Casey
2012-08-21 2:16 ` Jay Soffian
2012-08-21 3:46 ` Junio C Hamano
2012-08-21 1:57 ` Jeff King
2012-08-21 3:49 ` Junio C Hamano
2012-08-21 6:10 ` Jeff King
2012-08-21 6:22 ` Jeff King
2012-08-21 6:26 ` Jeff King
2012-08-21 6:31 ` Jeff King
2012-08-21 16:50 ` Junio C Hamano
2012-08-21 19:33 ` Jeff King
2012-08-21 16:43 ` Junio C Hamano
2012-08-21 21:52 ` Junio C Hamano [this message]
2012-08-21 21:53 ` Jeff King
2012-08-21 2:08 ` Sitaram Chamarty
2012-09-10 13:24 ` John Arthorne
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=7va9xndibh.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=arthorne.eclipse@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sitaramc@gmail.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.
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 NNTP newsgroup(s).