Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.33.6 2021-11-04T19:20:14Z 2021-11-04T19:20:14Z Junio C Hamano gitster@pobox.com 2021-11-04T19:20:14Z urn:sha1:ecb8d9d11ed97619f17e2c98d49409aa8127653f Regression fix. * pw/rebase-r-fixes: rebase -i: fix rewording with --committer-date-is-author-date 2021-11-03T17:44:45Z Phillip Wood phillip.wood@dunelm.org.uk 2021-11-02T21:30:51Z urn:sha1:9d6b9df128f842d2945e20e0760489ec6f3d2c0c baf8ec8d3a (rebase -r: don't write .git/MERGE_MSG when fast-forwarding, 2021-08-20) stopped reading the author script in run_git_commit() when rewording a commit. This is normally safe because "git commit --amend" preserves the authorship. However if the user passes "--committer-date-is-author-date" then we need to read the author date from the author script when rewording. Fix this regression by tightening the check for when it is safe to skip reading the author script. Reported-by: Jonas Kittner <jonas.kittner@ruhr-uni-bochum.de> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-10-12T20:51:39Z Junio C Hamano gitster@pobox.com 2021-10-12T20:51:39Z urn:sha1:3fb1d4da5e7053b54a7e82543fba679f64f72b9d Various bugs in "git rebase -r" have been fixed. * pw/rebase-r-fixes: rebase -r: fix merge -c with a merge strategy rebase -r: don't write .git/MERGE_MSG when fast-forwarding rebase -i: add another reword test rebase -r: make 'merge -c' behave like reword 2021-10-12T20:51:39Z Junio C Hamano gitster@pobox.com 2021-10-12T20:51:39Z urn:sha1:8b02ffee3f802989eb74180a907e1d60cfe4a549 Checking out all the paths from HEAD during the last conflicted step in "git rebase" and continuing would cause the step to be skipped (which is expected), but leaves MERGE_MSG file behind in $GIT_DIR and confuses the next "git commit", which has been corrected. * pw/rebase-skip-final-fix: rebase --continue: remove .git/MERGE_MSG rebase --apply: restore some tests t3403: fix commit authorship 2021-08-23T16:36:30Z Phillip Wood phillip.wood@dunelm.org.uk 2021-08-20T15:40:38Z urn:sha1:f2563c9ef3c028b5d4165df02fdfc0fcd613102d If a rebase is started with a --strategy option other than "ort" or "recursive" then "merge -c" does not allow the user to reword the commit message. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-08-23T16:36:30Z Phillip Wood phillip.wood@dunelm.org.uk 2021-08-20T15:40:37Z urn:sha1:baf8ec8d3a0327307f79efd31d5717a0c91c4d8c When fast-forwarding we do not create a new commit so .git/MERGE_MSG is not removed and can end up seeding the message of a commit made after the rebase has finished. Avoid writing .git/MERGE_MSG when we are fast-forwarding by writing the file after the fast-forward checks. Note that there are no changes to the fast-forward code, it is simply moved. Note that the way this change is implemented means we no longer write the author script when fast-forwarding either. I believe this is safe for the reasons below but it is a departure from what we do when fast-forwarding a non-merge commit. If we reword the merge then 'git commit --amend' will keep the authorship of the commit we're rewording as it ignores GIT_AUTHOR_* unless --reset-author is passed. It will also export the correct GIT_AUTHOR_* variables to any hooks and we already test the authorship of the reworded commit. If we are not rewording then we no longer call spilt_ident() which means we are no longer checking the commit author header looks sane. However this is what we already do when fast-forwarding non-merge commits in skip_unnecessary_picks() so I don't think we're breaking any promises by not checking the author here. Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-08-20T19:54:36Z Phillip Wood phillip.wood@dunelm.org.uk 2021-08-20T15:40:35Z urn:sha1:2be6b6f411136c6773a90d2cfdacf3cccb79d3e6 If the user runs git log while rewording a commit it is confusing if sometimes we're amending the commit that's being reworded and at other times we're creating a new commit depending on whether we could fast-forward or not[1]. For this reason the reword command ensures that there are no uncommitted changes when rewording. The reword command also allows the user to edit the todo list while the rebase is paused. As 'merge -c' also rewords commits make it behave like reword and add a test. [1] https://lore.kernel.org/git/xmqqlfvu4be3.fsf@gitster-ct.c.googlers.com/T/#m133009cb91cf0917bcf667300f061178be56680a Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-08-13T18:36:22Z Phillip Wood phillip.wood@dunelm.org.uk 2021-08-12T13:42:09Z urn:sha1:e5ee33e8551fa934862b8cbe50693f4841e7dace If the user skips the final commit by removing all the changes from the index and worktree with 'git restore' (or read-tree) and then runs 'git rebase --continue' .git/MERGE_MSG is left behind. This will seed the commit message the next time the user commits which is not what we want to happen. Reported-by: Victor Gambier <vgambier@excilys.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-08-05T15:57:40Z Elijah Newren newren@gmail.com 2021-08-04T23:50:54Z urn:sha1:81483fe613de70e17913167876676528cb37cbcd There were two locations in the code that referred to 'merge-recursive' but which were also applicable to 'merge-ort'. Update them to more general wording. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-07-13T22:20:20Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2021-07-13T08:05:18Z urn:sha1:48ca53cac4a5bee2dee3a5f3d6550753bf696d28 Add missing __attribute__((format)) function attributes to various "static" functions that take printf arguments. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>