* [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()`
@ 2018-05-06 14:10 Martin Ågren
2018-05-06 15:54 ` David Turner
2018-05-08 18:10 ` Jeff King
0 siblings, 2 replies; 4+ messages in thread
From: Martin Ågren @ 2018-05-06 14:10 UTC (permalink / raw)
To: git; +Cc: David Turner
After taking the lock we check whether we got it and die otherwise. But
since we take the lock using `LOCK_DIE_ON_ERROR`, we would already have
died.
Unlike in the previous patch, this function is not prepared for
indicating errors via a `strbuf err`, so let's just drop the dead code.
Any improved error-handling can be added later.
While at it, make the lock non-static and reduce its scope.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
refs.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index 8c50b8b139..7abd30dfe1 100644
--- a/refs.c
+++ b/refs.c
@@ -689,20 +689,17 @@ static int write_pseudoref(const char *pseudoref, const struct object_id *oid,
static int delete_pseudoref(const char *pseudoref, const struct object_id *old_oid)
{
- static struct lock_file lock;
const char *filename;
filename = git_path("%s", pseudoref);
if (old_oid && !is_null_oid(old_oid)) {
- int fd;
+ struct lock_file lock = LOCK_INIT;
struct object_id actual_old_oid;
- fd = hold_lock_file_for_update_timeout(
+ hold_lock_file_for_update_timeout(
&lock, filename, LOCK_DIE_ON_ERROR,
get_files_ref_lock_timeout_ms());
- if (fd < 0)
- die_errno(_("Could not open '%s' for writing"), filename);
if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
if (oidcmp(&actual_old_oid, old_oid)) {
--
2.17.0.411.g9fd64c8e46
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()`
2018-05-06 14:10 [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()` Martin Ågren
@ 2018-05-06 15:54 ` David Turner
2018-05-08 18:10 ` Jeff King
1 sibling, 0 replies; 4+ messages in thread
From: David Turner @ 2018-05-06 15:54 UTC (permalink / raw)
To: Martin Ågren, git
Same concern here about staticness.
On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote:
> After taking the lock we check whether we got it and die otherwise.
> But
> since we take the lock using `LOCK_DIE_ON_ERROR`, we would already
> have
> died.
>
> Unlike in the previous patch, this function is not prepared for
> indicating errors via a `strbuf err`, so let's just drop the dead
> code.
> Any improved error-handling can be added later.
>
> While at it, make the lock non-static and reduce its scope.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> refs.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 8c50b8b139..7abd30dfe1 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -689,20 +689,17 @@ static int write_pseudoref(const char
> *pseudoref, const struct object_id *oid,
>
> static int delete_pseudoref(const char *pseudoref, const struct
> object_id *old_oid)
> {
> - static struct lock_file lock;
> const char *filename;
>
> filename = git_path("%s", pseudoref);
>
> if (old_oid && !is_null_oid(old_oid)) {
> - int fd;
> + struct lock_file lock = LOCK_INIT;
> struct object_id actual_old_oid;
>
> - fd = hold_lock_file_for_update_timeout(
> + hold_lock_file_for_update_timeout(
> &lock, filename, LOCK_DIE_ON_ERROR,
> get_files_ref_lock_timeout_ms());
> - if (fd < 0)
> - die_errno(_("Could not open '%s' for
> writing"), filename);
> if (read_ref(pseudoref, &actual_old_oid))
> die("could not read ref '%s'", pseudoref);
> if (oidcmp(&actual_old_oid, old_oid)) {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()`
2018-05-06 14:10 [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()` Martin Ågren
2018-05-06 15:54 ` David Turner
@ 2018-05-08 18:10 ` Jeff King
2018-05-09 4:23 ` Martin Ågren
1 sibling, 1 reply; 4+ messages in thread
From: Jeff King @ 2018-05-08 18:10 UTC (permalink / raw)
To: Martin Ågren; +Cc: git, David Turner
On Sun, May 06, 2018 at 04:10:29PM +0200, Martin Ågren wrote:
> After taking the lock we check whether we got it and die otherwise. But
> since we take the lock using `LOCK_DIE_ON_ERROR`, we would already have
> died.
>
> Unlike in the previous patch, this function is not prepared for
> indicating errors via a `strbuf err`, so let's just drop the dead code.
> Any improved error-handling can be added later.
I suspect this ought to eventually be converted to return an error, to
match the rest of the refs code. And in that sense, this is a step
backwards versus leaving the current die_errno in place and dropping the
LOCK_DIE_ON_ERROR flag. But it probably doesn't matter much either way,
and whoever does the conversion later can deal with it.
-Peff
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()`
2018-05-08 18:10 ` Jeff King
@ 2018-05-09 4:23 ` Martin Ågren
0 siblings, 0 replies; 4+ messages in thread
From: Martin Ågren @ 2018-05-09 4:23 UTC (permalink / raw)
To: Jeff King; +Cc: Git Mailing List, David Turner
On 8 May 2018 at 20:10, Jeff King <peff@peff.net> wrote:
> On Sun, May 06, 2018 at 04:10:29PM +0200, Martin Ågren wrote:
>> Unlike in the previous patch, this function is not prepared for
>> indicating errors via a `strbuf err`, so let's just drop the dead code.
>> Any improved error-handling can be added later.
>
> I suspect this ought to eventually be converted to return an error, to
> match the rest of the refs code. And in that sense, this is a step
> backwards versus leaving the current die_errno in place and dropping the
> LOCK_DIE_ON_ERROR flag. But it probably doesn't matter much either way,
> and whoever does the conversion later can deal with it.
Thank you for your comments on this series. It's much appreciated. I
will be rerolling this series with extended commit messages about the
lock-handling. Looking over this code again, I notice that a larger
cleanup of the error-handling might be warranted. It would indeed feel
better to do a minor part of that, instead of taking a small step in the
wrong direction...
Martin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-09 4:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-06 14:10 [PATCH 3/5] refs.c: drop dead code checking lock status in `delete_pseudoref()` Martin Ågren
2018-05-06 15:54 ` David Turner
2018-05-08 18:10 ` Jeff King
2018-05-09 4:23 ` Martin Ågren
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).