mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Fix revert --abort on Windows
On Windows, it is not possible to rename or remove a directory that has open files. 'revert --abort' renamed .git/sequencer when it still had .git/sequencer/head open. Close the file as early as possible to allow the rename operation on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b4524d343b
commit
2a4037d0a7
|
@ -931,8 +931,10 @@ static int sequencer_rollback(struct replay_opts *opts)
|
|||
if (strbuf_getline(&buf, f, '\n')) {
|
||||
error(_("cannot read %s: %s"), filename, ferror(f) ?
|
||||
strerror(errno) : _("unexpected end of file"));
|
||||
fclose(f);
|
||||
goto fail;
|
||||
}
|
||||
fclose(f);
|
||||
if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
|
||||
error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
|
||||
filename);
|
||||
|
@ -941,11 +943,9 @@ static int sequencer_rollback(struct replay_opts *opts)
|
|||
if (reset_for_rollback(sha1))
|
||||
goto fail;
|
||||
strbuf_release(&buf);
|
||||
fclose(f);
|
||||
return 0;
|
||||
fail:
|
||||
strbuf_release(&buf);
|
||||
fclose(f);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue