Skip to content

sequencer: release the ODB before spawning git commit #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dscho wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Open

sequencer: release the ODB before spawning git commit #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,7 @@ static int run_git_commit(const char *defmsg,
struct child_process cmd = CHILD_PROCESS_INIT;

cmd.git_cmd = 1;
cmd.odb_to_close = the_repository->objects;

if (is_rebase_i(opts) &&
((opts->committer_date_is_author_date && !opts->ignore_date) ||
Expand Down
18 changes: 18 additions & 0 deletions t/t3404-rebase-interactive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,24 @@ test_expect_success 'setup' '
test_commit P fileP
'

test_expect_success MINGW 'rebase releases object database before committing' '
test_when_finished "rm -f .git/hooks/post-commit repacked packs" &&
git switch -C repack-rewrite primary &&
git repack -ad &&
write_script .git/hooks/post-commit <<-\EOF &&
git repack -ad &&
>repacked
EOF
(
set_fake_editor &&
FAKE_LINES="reword 1" GIT_TEST_LEGACY_DELETE=1 \
git -c core.commitGraph=false rebase -i HEAD^
) &&
test_path_is_file repacked &&
ls .git/objects/pack/*.pack >packs &&
test_line_count = 1 packs
'

# "exec" commands are run with the user shell by default, but this may
# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
# to create a file. Unsetting SHELL avoids such non-portable behavior
Expand Down
Loading