From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Yaroslav Halchenko" <yoh@onerussian.com>,
"SZEDER Gábor" <szeder@ira.uka.de>, "Jeff King" <peff@peff.net>
Subject: [PATCH v2 1/2] commit: allow editing the commit message even in shared repos
Date: Wed, 6 Jan 2016 14:09:43 +0100 (CET) [thread overview]
Message-ID: <38701d9358765af334ce405eb4a29f0063dae670.1452085713.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1452085713.git.johannes.schindelin@gmx.de>
It was pointed out by Yaroslav Halchenko that the file containing the
commit message is writable only by the owner, which means that we have
to rewrite it from scratch in a shared repository.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
builtin/commit.c | 2 +-
git-compat-util.h | 1 +
wrapper.c | 13 +++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index d054f84..89bf6ad 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -761,7 +761,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
hook_arg2 = "";
}
- s->fp = fopen(git_path(commit_editmsg), "w");
+ s->fp = fopen_for_writing(git_path(commit_editmsg));
if (s->fp == NULL)
die_errno(_("could not open '%s'"), git_path(commit_editmsg));
diff --git a/git-compat-util.h b/git-compat-util.h
index 2da0a75..e8f2867 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -733,6 +733,7 @@ extern int xmkstemp_mode(char *template, int mode);
extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
extern char *xgetcwd(void);
+extern FILE *fopen_for_writing(const char *path);
#define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), (alloc) * sizeof(*(x)))
diff --git a/wrapper.c b/wrapper.c
index b43d437..29a45d2 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -391,6 +391,19 @@ FILE *xfdopen(int fd, const char *mode)
return stream;
}
+FILE *fopen_for_writing(const char *path)
+{
+ FILE *ret = fopen(path, "w");
+
+ if (!ret && errno == EPERM) {
+ if (!unlink(path))
+ ret = fopen(path, "w");
+ else
+ errno = EPERM;
+ }
+ return ret;
+}
+
int xmkstemp(char *template)
{
int fd;
--
2.6.3.windows.1.300.g1c25e49
next prev parent reply other threads:[~2016-01-06 13:10 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-19 18:21 [PATCH] commit: ensure correct permissions of the commit message Johannes Schindelin
2015-12-20 7:45 ` Jeff King
2015-12-20 14:21 ` Johannes Schindelin
2015-12-20 22:57 ` Torsten Bögershausen
2015-12-30 14:57 ` Johannes Schindelin
2015-12-21 1:31 ` Junio C Hamano
2015-12-21 6:59 ` Jeff King
2015-12-21 17:22 ` Junio C Hamano
2015-12-30 14:50 ` Johannes Schindelin
2015-12-30 22:56 ` Junio C Hamano
2016-01-01 15:04 ` Johannes Schindelin
2016-01-04 18:34 ` Junio C Hamano
2016-01-05 12:52 ` Johannes Schindelin
2016-01-05 19:39 ` Junio C Hamano
2016-01-06 8:20 ` Johannes Schindelin
2016-01-06 8:23 ` Jeff King
2016-01-06 8:50 ` Johannes Schindelin
2016-01-15 1:12 ` SZEDER Gábor
2016-01-15 1:29 ` Junio C Hamano
2016-01-15 6:51 ` Johannes Schindelin
2016-01-15 10:51 ` SZEDER Gábor
2016-01-15 12:18 ` Johannes Schindelin
2016-01-06 13:09 ` [PATCH v2 0/2] Correctly handle transient files in shared repositories Johannes Schindelin
2016-01-06 13:09 ` Johannes Schindelin [this message]
2016-01-07 12:41 ` [PATCH v2 1/2] commit: allow editing the commit message even in shared repos Jeff King
2016-01-07 21:35 ` Junio C Hamano
2016-01-06 13:09 ` [PATCH v2 2/2] Handle more file writes correctly " Johannes Schindelin
2016-01-07 12:46 ` Jeff King
2016-01-08 16:04 ` Johannes Schindelin
2016-01-07 21:52 ` Junio C Hamano
2016-01-08 16:05 ` Johannes Schindelin
2016-01-08 17:59 ` Junio C Hamano
2016-01-11 9:28 ` Johannes Schindelin
2016-01-11 15:57 ` Junio C Hamano
2016-01-11 17:06 ` Junio C Hamano
2016-01-11 18:35 ` [PATCH v3 0/2] Correctly handle transient files in shared repositories Johannes Schindelin
2016-01-11 18:35 ` [PATCH v3 1/2] commit: allow editing the commit message even in shared repos Johannes Schindelin
2016-01-11 18:35 ` [PATCH v3 2/2] Handle more file writes correctly " Johannes Schindelin
2016-01-11 20:22 ` [PATCH v3 0/2] Correctly handle transient files in shared repositories Jeff King
2016-01-11 21:12 ` Junio C Hamano
2016-01-11 21:22 ` Junio C Hamano
2016-01-11 21:38 ` Jeff King
2016-01-11 21:54 ` Junio C Hamano
2016-01-11 22:06 ` Jeff King
2016-01-12 8:05 ` Johannes Schindelin
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=38701d9358765af334ce405eb4a29f0063dae670.1452085713.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
--cc=yoh@onerussian.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).