Better suggestions when git-am(1) fails
- From
- Alejandro Colomar <alx.manpages@gmail.com>
- Date
- Mar 8, 2023, 20:15 UTC
- Message-ID
- <897c200c-afb3-ceb4-bf44-9af651f5feb4@gmail.com>
Hi,
I had the following error already a few times, when some contributors, for some reason unknown to me, remove the leading path components from the patch. Now I know that the fix is to use -p0, but the first times it wasn't obvious. And still I forget about -p0 sometimes and it's hard to find in the manual pages. I think it would be good to suggest using it when such an error appears.
$ git am -s patches/\[PATCH\ 1_2\]\ CONTRIBUTING\:\ Fix\ typo\,\ there\ is\ one\ active\ maintainer\ -\ Rodrigo\ Campos\ \<rodrigo@sdfg.com.ar\>\ -\ 2023-03-08\ 1622.eml Applying: CONTRIBUTING: Fix typo, there is one active maintainer error: git diff header lacks filename information when removing 1 leading pathname component (line 9) Patch failed at 0001 CONTRIBUTING: Fix typo, there is one active maintainer 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". alx@asus5775:~/src/linux/man-pages/man-pages/main$ man git-am alx@asus5775:~/src/linux/man-pages/man-pages/main$ git am --show-current-patch=diff --- CONTRIBUTING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git CONTRIBUTING CONTRIBUTING index 3b4408108..3bb671eca 100644 --- CONTRIBUTING +++ CONTRIBUTING @@ -8,7 +8,7 @@ Description Mailing list The main discussions regarding development of the project, patches, bugs, news, doubts, etc. happen on the mailing list. To send an email - to the project, send it to both maintainers and CC the mailing list: + to the project, send it to Alejandro and CC the mailing list: To: Alejandro Colomar <alx@kernel.org> Cc: <linux-man@vger.kernel.org>
-- 2.39.2 git(1) could recommend using `-p` to sort this out. It could go further and check which level would be needed for the patch to apply, but at the very least it could tell the user which option it wants to look for in the documentation. Does this make sense to you? I usually find git-am error messages quite uninformative. Cheers, Alex -- <http://www.alejandro-colomar.es/> GPG key fingerprint: A9348594CE31283A826FBDD8D57633D441E25BB5