> Not sure if this is really the right thing to do here. Many people will have 
> a name and email set in their global git config. This change makes it 
> impossible to overwrite that via macros. I can imagine people not wanting 
> their general git settings ending up in there.

Not sure what you mean. You can still set the `GIT_COMMIT_AUTHOR` envvar or the 
`--author` flag in the macros, and it will overwrite anything configured. It's 
actually the thing I'm counting on, since AFAIK all the other git-related 
macros specify the `--author` flag, so for the macros, the behavior should not 
even change.

> If you have proper git formatted patches, I think you'll have better luck 
> with -S git_am instead of plain -S git, the latter is really only intended to 
> get random patches under at least a little bit of version control.

I'm using `-S git_am`. The thing I'm trying to fix manifests in 2 cases:

1. I'm making new commits on top of the already applied ones from scratch (i.e. 
distro-specific Makefile patches or similar, not-worth-upstreaming small 
changes) and then exporting them as new patches. These new patches are now 
`From: rpm-build <rpm-build>`, unless I remember to explicitly specify myself 
as author on every commit (which is definitely not part of my muscle memory).
2. I have, in my global config, `format.signOff = true`. *Any* patches I export 
from the git are now `Signed-off-by: rpm-build <rpm-build>`, which does not 
make a whole lot of sense. AFAIK this part cannot be changed with envvar, it 
always uses `user.name` and `user.email`.

---

In case it's relevant, this is my usual workflow when doing an RPM package 
update:

1. I have `%autosetup -S git_am` in spec, and run `{fed,cent,rh}pkg prep` 
(`rpmbuild -bp`).
2. In case of any issues, `cd unpacked-source`, manually adjust what's needed, 
`git am --continue` if I was adjusting existing patch or `git commit` when I 
needed new changes not importable from elsewhere.
3. Finally, if any changes were necessary, `git format-patch -o.. master` to 
re-export all the applied patches to dist-git.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3472#issuecomment-2507514244
You are receiving this because you are subscribed to this thread.

Message ID: <rpm-software-management/rpm/pull/3472/c2507514...@github.com>
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
https://lists.rpm.org/mailman/listinfo/rpm-maint

Reply via email to