| Message ID | fb5f64c52010e01ce0b5a886e9611fa2a6ea7833.1657631226.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rebase: update branches in multi-part topic | expand |
Hi Stolee On 12/07/2022 14:07, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee <derrickstolee@github.com> > > The previous change introduced the 'git rebase --update-refs' option > which added 'update-ref <ref>' commands to the todo list of an > interactive rebase. > > Teach Git to record the HEAD position when reaching these 'update-ref' > commands. The ref/before/after triple is stored in the > $GIT_DIR/rebase-merge/update-refs file. A previous change parsed this > file to avoid having other processes updating the refs in that file > while the rebase is in progress. > > Not only do we update the file when the sequencer reaches these > 'update-ref' commands, we then update the refs themselves at the end of > the rebase sequence. If the rebase is aborted before this final step, > then the refs are not updated. The 'before' value is used to ensure that > we do not accidentally obliterate a ref that was updated concurrently > (say, by an older version of Git or a third-party tool). > > Now that the 'git rebase --update-refs' command is implemented to write > to the update-refs file, we can remove the fake construction of the > update-refs file from a test in t2407-worktree-heads.sh. This is looking good. I've left a few comments, mostly about error propagation. It's nice to see us recording the initial value of the ref when the todo list is created. It's also good to see this using a lock file. We could perhaps lock the file (with a timeout) when we read it in sequencer_get_update_refs_state() to avoid a race where a process is checking out a new branch in one worktree and another is preparing to rebase that branch in another worktree. > Signed-off-by: Derrick Stolee <derrickstolee@github.com> > --- > sequencer.c | 113 +++++++++++++++++++++++++++++++++- > t/t2407-worktree-heads.sh | 21 ++----- > t/t3404-rebase-interactive.sh | 17 +++++ > 3 files changed, 134 insertions(+), 17 deletions(-) > > diff --git a/sequencer.c b/sequencer.c > index e657862cda2..2d89b3b727a 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -36,6 +36,7 @@ > #include "rebase-interactive.h" > #include "reset.h" > #include "branch.h" > +#include "log-tree.h" > > #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" > > @@ -193,6 +194,19 @@ struct update_ref_record { > struct object_id after; > }; > > +static struct update_ref_record *init_update_ref_record(const char *ref) > +{ > + struct update_ref_record *rec = xmalloc(sizeof(*rec)); > + > + oidcpy(&rec->before, null_oid()); > + oidcpy(&rec->after, null_oid()); > + > + /* This may fail, but that's fine, we will keep the null OID. */ > + read_ref(ref, &rec->before); > + > + return rec; > +} > + > static int git_sequencer_config(const char *k, const char *v, void *cb) > { > struct replay_opts *opts = cb; > @@ -4081,11 +4095,102 @@ leave_merge: > return ret; > } > > -static int do_update_ref(struct repository *r, const char *ref_name) > +static int write_update_refs_state(struct string_list *refs_to_oids) > { > + int result = 0; > + struct lock_file lock = LOCK_INIT; > + FILE *fp = NULL; > + struct string_list_item *item; > + char *path; > + > + if (!refs_to_oids->nr) > + return 0; > + > + path = rebase_path_update_refs(the_repository->gitdir); > + > + if (safe_create_leading_directories(path)) { > + result = error(_("unable to create leading directories of %s"), > + path); > + goto cleanup; > + } > + > + if (hold_lock_file_for_update(&lock, path, 0) < 0) { > + result = error(_("another 'rebase' process appears to be running; " > + "'%s.lock' already exists"), > + path); > + goto cleanup; > + } > + > + fp = fdopen_lock_file(&lock, "w"); > + if (!fp) { > + result = error_errno(_("could not open '%s' for writing"), path); > + rollback_lock_file(&lock); > + goto cleanup; > + } > + > + for_each_string_list_item(item, refs_to_oids) { > + struct update_ref_record *rec = item->util; > + fprintf(fp, "%s\n%s\n%s\n", item->string, > + oid_to_hex(&rec->before), oid_to_hex(&rec->after)); > + } > + > + result = commit_lock_file(&lock); > + > +cleanup: > + free(path); > + return result; > +} > + > +static int do_update_ref(struct repository *r, const char *refname) > +{ > + struct string_list_item *item; > + struct string_list list = STRING_LIST_INIT_DUP; > + > + sequencer_get_update_refs_state(r->gitdir, &list); We're ignoring any errors here and always returning 0 from this function. > + > + for_each_string_list_item(item, &list) { > + if (!strcmp(item->string, refname)) { > + struct update_ref_record *rec = item->util; > + read_ref("HEAD", &rec->after); > + break; > + } > + } > + > + write_update_refs_state(&list); > + string_list_clear(&list, 1); > return 0; > } > > +static int do_update_refs(struct repository *r) > +{ > + int res = 0; > + struct string_list_item *item; > + struct string_list refs_to_oids = STRING_LIST_INIT_DUP; > + struct ref_store *refs = get_main_ref_store(r); > + > + sequencer_get_update_refs_state(r->gitdir, &refs_to_oids); > + > + for_each_string_list_item(item, &refs_to_oids) { > + struct update_ref_record *rec = item->util; > + > + if (oideq(&rec->after, the_hash_algo->null_oid)) { > + /* > + * Ref was not updated. User may have deleted the > + * 'update-ref' step. > + */ Unless we want to support users editing the todo list without using "git rebase --edit-todo" then by the end of the series it is a bug if we leave an entry in the update-refs file that has been removed from the todo list so I wander if we should remove this if(). > + continue; > + } > + > + res |= refs_update_ref(refs, "rewritten during rebase", > + item->string, > + &rec->after, &rec->before, > + 0, UPDATE_REFS_MSG_ON_ERR); > + } > + > + string_list_clear(&refs_to_oids, 1); > + return res; > +} > + > static int is_final_fixup(struct todo_list *todo_list) > { > int i = todo_list->current; > @@ -4603,6 +4708,8 @@ cleanup_head_ref: > strbuf_release(&head_ref); > } > > + do_update_refs(r); Should this be inside the "if (is_rebase_i(opts))" that is closed just above it? We're also ignoring the return value. > + > /* > * Sequence of picks finished successfully; cleanup by > * removing the .git/sequencer directory > @@ -5676,7 +5783,7 @@ static int add_decorations_to_list(const struct commit *commit, > > sti = string_list_insert(&ctx->refs_to_oids, > decoration->name); > - sti->util = oiddup(the_hash_algo->null_oid); > + sti->util = init_update_ref_record(decoration->name); > } > > item->offset_in_buf = base_offset; > @@ -5732,6 +5839,8 @@ static int todo_list_add_update_ref_commands(struct todo_list *todo_list) > } > } > > + write_update_refs_state(&ctx.refs_to_oids); We're ignoring the return value. Also I think todo_list_add_update_ref_commands() only ever returns 0. Best Wishes Phillip > + > string_list_clear(&ctx.refs_to_oids, 1); > free(todo_list->items); > todo_list->items = ctx.items; > diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh > index 8a03f14df8d..50815acd3e8 100755 > --- a/t/t2407-worktree-heads.sh > +++ b/t/t2407-worktree-heads.sh > @@ -81,25 +81,16 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (mer > grep "cannot force update the branch '\''wt-2'\'' checked out at.*wt-2" err > ' > > -test_expect_success 'refuse to overwrite: worktree in rebase with --update-refs' ' > - test_when_finished rm -rf .git/worktrees/wt-3/rebase-merge && > - > - mkdir -p .git/worktrees/wt-3/rebase-merge && > - touch .git/worktrees/wt-3/rebase-merge/interactive && > +test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with --update-refs' ' > + test_when_finished git -C wt-3 rebase --abort && > > - cat >.git/worktrees/wt-3/rebase-merge/update-refs <<-EOF && > - refs/heads/fake-3 > - $(git rev-parse HEAD~1) > - $(git rev-parse HEAD) > - refs/heads/fake-4 > - $(git rev-parse HEAD) > - $(git rev-parse HEAD) > - EOF > + git branch -f can-be-updated wt-3 && > + test_must_fail git -C wt-3 rebase --update-refs conflict-3 && > > for i in 3 4 > do > - test_must_fail git branch -f fake-$i HEAD 2>err && > - grep "cannot force update the branch '\''fake-$i'\'' checked out at.*wt-3" err || > + test_must_fail git branch -f can-be-updated HEAD 2>err && > + grep "cannot force update the branch '\''can-be-updated'\'' checked out at.*wt-3" err || > return 1 > done > ' > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index 3cd20733bc8..a37820fa728 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -1813,6 +1813,23 @@ test_expect_success '--update-refs adds commands with --rebase-merges' ' > ) > ' > > +test_expect_success '--update-refs updates refs correctly' ' > + git checkout -B update-refs no-conflict-branch && > + git branch -f base HEAD~4 && > + git branch -f first HEAD~3 && > + git branch -f second HEAD~3 && > + git branch -f third HEAD~1 && > + test_commit extra2 fileX && > + git commit --amend --fixup=L && > + > + git rebase -i --autosquash --update-refs primary && > + > + test_cmp_rev HEAD~3 refs/heads/first && > + test_cmp_rev HEAD~3 refs/heads/second && > + test_cmp_rev HEAD~1 refs/heads/third && > + test_cmp_rev HEAD refs/heads/no-conflict-branch > +' > + > # This must be the last test in this file > test_expect_success '$EDITOR and friends are unchanged' ' > test_editor_unchanged
On 7/15/2022 9:25 AM, Phillip Wood wrote: >> Now that the 'git rebase --update-refs' command is implemented to write >> to the update-refs file, we can remove the fake construction of the >> update-refs file from a test in t2407-worktree-heads.sh. > > This is looking good. I've left a few comments, mostly about error propagation. It's nice to see us recording the initial value of the ref when the todo list is created. It's also good to see this using a lock file. We could perhaps lock the file (with a timeout) when we read it in sequencer_get_update_refs_state() to avoid a race where a process is checking out a new branch in one worktree and another is preparing to rebase that branch in another worktree. >> +static int do_update_ref(struct repository *r, const char *refname) >> +{ >> + struct string_list_item *item; >> + struct string_list list = STRING_LIST_INIT_DUP; >> + >> + sequencer_get_update_refs_state(r->gitdir, &list); > > We're ignoring any errors here and always returning 0 from this function. Thanks. Will fix. >> + >> + for_each_string_list_item(item, &list) { >> + if (!strcmp(item->string, refname)) { >> + struct update_ref_record *rec = item->util; >> + read_ref("HEAD", &rec->after); This is the other place where we could have a failure. >> +static int do_update_refs(struct repository *r) >> +{ >> + int res = 0; >> + struct string_list_item *item; >> + struct string_list refs_to_oids = STRING_LIST_INIT_DUP; >> + struct ref_store *refs = get_main_ref_store(r); >> + >> + sequencer_get_update_refs_state(r->gitdir, &refs_to_oids); We need to check for failure here, too. >> + for_each_string_list_item(item, &refs_to_oids) { >> + struct update_ref_record *rec = item->util; >> + >> + if (oideq(&rec->after, the_hash_algo->null_oid)) { >> + /* >> + * Ref was not updated. User may have deleted the >> + * 'update-ref' step. >> + */ > > Unless we want to support users editing the todo list without using "git rebase --edit-todo" then by the end of the series it is a bug if we leave an entry in the update-refs file that has been removed from the todo list so I wander if we should remove this if(). I think this is leftover from the previous version and will never happen. If rec->after is null, then it would be removed earlier when parsing the todo list. >> + do_update_refs(r); > > Should this be inside the "if (is_rebase_i(opts))" that is closed just above it? We're also ignoring the return value. Couldn't hurt. Should be a no-op if not in interactive mode. >> + write_update_refs_state(&ctx.refs_to_oids); > > We're ignoring the return value. Also I think todo_list_add_update_ref_commands() only ever returns 0. Thanks for your attention to detail here. -Stolee
diff --git a/sequencer.c b/sequencer.c index e657862cda2..2d89b3b727a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -36,6 +36,7 @@ #include "rebase-interactive.h" #include "reset.h" #include "branch.h" +#include "log-tree.h" #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" @@ -193,6 +194,19 @@ struct update_ref_record { struct object_id after; }; +static struct update_ref_record *init_update_ref_record(const char *ref) +{ + struct update_ref_record *rec = xmalloc(sizeof(*rec)); + + oidcpy(&rec->before, null_oid()); + oidcpy(&rec->after, null_oid()); + + /* This may fail, but that's fine, we will keep the null OID. */ + read_ref(ref, &rec->before); + + return rec; +} + static int git_sequencer_config(const char *k, const char *v, void *cb) { struct replay_opts *opts = cb; @@ -4081,11 +4095,102 @@ leave_merge: return ret; } -static int do_update_ref(struct repository *r, const char *ref_name) +static int write_update_refs_state(struct string_list *refs_to_oids) { + int result = 0; + struct lock_file lock = LOCK_INIT; + FILE *fp = NULL; + struct string_list_item *item; + char *path; + + if (!refs_to_oids->nr) + return 0; + + path = rebase_path_update_refs(the_repository->gitdir); + + if (safe_create_leading_directories(path)) { + result = error(_("unable to create leading directories of %s"), + path); + goto cleanup; + } + + if (hold_lock_file_for_update(&lock, path, 0) < 0) { + result = error(_("another 'rebase' process appears to be running; " + "'%s.lock' already exists"), + path); + goto cleanup; + } + + fp = fdopen_lock_file(&lock, "w"); + if (!fp) { + result = error_errno(_("could not open '%s' for writing"), path); + rollback_lock_file(&lock); + goto cleanup; + } + + for_each_string_list_item(item, refs_to_oids) { + struct update_ref_record *rec = item->util; + fprintf(fp, "%s\n%s\n%s\n", item->string, + oid_to_hex(&rec->before), oid_to_hex(&rec->after)); + } + + result = commit_lock_file(&lock); + +cleanup: + free(path); + return result; +} + +static int do_update_ref(struct repository *r, const char *refname) +{ + struct string_list_item *item; + struct string_list list = STRING_LIST_INIT_DUP; + + sequencer_get_update_refs_state(r->gitdir, &list); + + for_each_string_list_item(item, &list) { + if (!strcmp(item->string, refname)) { + struct update_ref_record *rec = item->util; + read_ref("HEAD", &rec->after); + break; + } + } + + write_update_refs_state(&list); + string_list_clear(&list, 1); return 0; } +static int do_update_refs(struct repository *r) +{ + int res = 0; + struct string_list_item *item; + struct string_list refs_to_oids = STRING_LIST_INIT_DUP; + struct ref_store *refs = get_main_ref_store(r); + + sequencer_get_update_refs_state(r->gitdir, &refs_to_oids); + + for_each_string_list_item(item, &refs_to_oids) { + struct update_ref_record *rec = item->util; + + if (oideq(&rec->after, the_hash_algo->null_oid)) { + /* + * Ref was not updated. User may have deleted the + * 'update-ref' step. + */ + continue; + } + + res |= refs_update_ref(refs, "rewritten during rebase", + item->string, + &rec->after, &rec->before, + 0, UPDATE_REFS_MSG_ON_ERR); + } + + string_list_clear(&refs_to_oids, 1); + return res; +} + static int is_final_fixup(struct todo_list *todo_list) { int i = todo_list->current; @@ -4603,6 +4708,8 @@ cleanup_head_ref: strbuf_release(&head_ref); } + do_update_refs(r); + /* * Sequence of picks finished successfully; cleanup by * removing the .git/sequencer directory @@ -5676,7 +5783,7 @@ static int add_decorations_to_list(const struct commit *commit, sti = string_list_insert(&ctx->refs_to_oids, decoration->name); - sti->util = oiddup(the_hash_algo->null_oid); + sti->util = init_update_ref_record(decoration->name); } item->offset_in_buf = base_offset; @@ -5732,6 +5839,8 @@ static int todo_list_add_update_ref_commands(struct todo_list *todo_list) } } + write_update_refs_state(&ctx.refs_to_oids); + string_list_clear(&ctx.refs_to_oids, 1); free(todo_list->items); todo_list->items = ctx.items; diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh index 8a03f14df8d..50815acd3e8 100755 --- a/t/t2407-worktree-heads.sh +++ b/t/t2407-worktree-heads.sh @@ -81,25 +81,16 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (mer grep "cannot force update the branch '\''wt-2'\'' checked out at.*wt-2" err ' -test_expect_success 'refuse to overwrite: worktree in rebase with --update-refs' ' - test_when_finished rm -rf .git/worktrees/wt-3/rebase-merge && - - mkdir -p .git/worktrees/wt-3/rebase-merge && - touch .git/worktrees/wt-3/rebase-merge/interactive && +test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase with --update-refs' ' + test_when_finished git -C wt-3 rebase --abort && - cat >.git/worktrees/wt-3/rebase-merge/update-refs <<-EOF && - refs/heads/fake-3 - $(git rev-parse HEAD~1) - $(git rev-parse HEAD) - refs/heads/fake-4 - $(git rev-parse HEAD) - $(git rev-parse HEAD) - EOF + git branch -f can-be-updated wt-3 && + test_must_fail git -C wt-3 rebase --update-refs conflict-3 && for i in 3 4 do - test_must_fail git branch -f fake-$i HEAD 2>err && - grep "cannot force update the branch '\''fake-$i'\'' checked out at.*wt-3" err || + test_must_fail git branch -f can-be-updated HEAD 2>err && + grep "cannot force update the branch '\''can-be-updated'\'' checked out at.*wt-3" err || return 1 done ' diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3cd20733bc8..a37820fa728 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1813,6 +1813,23 @@ test_expect_success '--update-refs adds commands with --rebase-merges' ' ) ' +test_expect_success '--update-refs updates refs correctly' ' + git checkout -B update-refs no-conflict-branch && + git branch -f base HEAD~4 && + git branch -f first HEAD~3 && + git branch -f second HEAD~3 && + git branch -f third HEAD~1 && + test_commit extra2 fileX && + git commit --amend --fixup=L && + + git rebase -i --autosquash --update-refs primary && + + test_cmp_rev HEAD~3 refs/heads/first && + test_cmp_rev HEAD~3 refs/heads/second && + test_cmp_rev HEAD~1 refs/heads/third && + test_cmp_rev HEAD refs/heads/no-conflict-branch +' + # This must be the last test in this file test_expect_success '$EDITOR and friends are unchanged' ' test_editor_unchanged