Created attachment 228753 [details] patch for ports-mgmt/pkg_tree Switched from PORTVERSION to DISTVERSION. URLs such as MASTER_SITES have been switched from http to https. Variables have been sorted to silence portclippy :) Regenerated distinfo by running make makesum "FORCE_FETCH_ALL=yes" "FETCH_ARGS=-pm".
Created attachment 228754 [details] poudriere log
Can you commit it to your local git repo and submit the patch created by `git format-patch`?
Created attachment 228910 [details] format-patch for ports-mgmt/pkg_tree (In reply to Koichiro Iwao from comment #2) こんな感じのやつでよいですか？ Is this what the format-patch should look like? The commands I used to generate it: rm -r -f -- ports-mgmt/pkg_tree/ cp -R -- ~/work/pkg_tree ports-mgmt/ git add -- ports-mgmt/pkg_tree git commit "--author=Tatsuki Makino <tatsuki_makino@hotmail.com>" -- git format-patch --no-prefix -1 "--output-directory=/tmp/" --start-number=1 "--subject-prefix=" HEAD In addition, the commands to restore the local clone to its original state: git reset --soft HEAD^ -- git restore --source=HEAD --staged -- ports-mgmt/pkg_tree (These additional information can be used as a reference to see what kind of ideas the less understanding maintainer might generate :) )
Comment on attachment 228910 [details] format-patch for ports-mgmt/pkg_tree Auto-detection will be application/mbox, so checking the patch is a must :)
(In reply to Tatsuki Makino from comment #4) And, the format doesn't work with Bugzilla's compare to previous file function.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ab4c64e83a569924c23143b22d9b67b1c54a25d commit 2ab4c64e83a569924c23143b22d9b67b1c54a25d Author: Koichiro Iwao <meta@FreeBSD.org> AuthorDate: 2021-10-28 07:46:09 +0000 Commit: Koichiro Iwao <meta@FreeBSD.org> CommitDate: 2021-10-28 07:48:05 +0000 ports-mgmt/pkg_tree: cleanup - Switch to DISTVERSION - Switch to https MASTER_SITES - Pet portclippy PR: 259207 ports-mgmt/pkg_tree/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
It failed to apply but hand applied. Simply do `git format-patch HEAD^1`. Applying: ports-mgmt/pkg_tree: cleanup error: pkg_tree/Makefile: does not exist in index error: pkg_tree/distinfo: does not exist in index Patch failed at 0001 ports-mgmt/pkg_tree: cleanup hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
(In reply to Koichiro Iwao from comment #7) ありがとうございます。 こちらでも git am attachment-228910.patch を実行したときに、そのようなメッセージを出して失敗しました。 git am -p0 attachment-228910.patch で実行した場合には Applying: 〜 の行だけ表示され、適用に成功したと思われます。 つまり、パッチを作る側が --no-prefix のようなオプションを追加していると、パッチを使うコミッター側でも -p0 のような余計なオプションが必要になってしまうということ。 と、 /usr/bin にある patch コマンドも -p を使わない(あるいは -p957)で diff --git の文字列を含むパッチを通せば、 git が付加する a/ や b/ を自動的に削る機能が入っているから、パスのあたりの細かい考慮は必要ないということのようでした。 English summary of the above: We don't need to add --no-prefix when we output patches in git, because git needs to make minor modifications like -p0 when it handles patches. Also, /usr/bin/patch can read the patches output by git without any modification.