Message ID | Y2jA5jLpvM8e2Cfu@tucnak |
---|---|
State | New |
Headers | show |
Series | [committed] Add another commit to ignore | expand |
On 11/7/22 09:25, Jakub Jelinek wrote: > Hi! > > We can't handle r13-3652-ge4cba49413ca429dc82f6aa2e88129ecb3fdd943 > because that commit removed whole liboffloadmic including its > ChangeLog (I'm surprised that touching ChangeLog worked out together > with removing the files), but gcc-changelog/git_update_version.py > then choked on it because it couldn't add the liboffloadmic > entries. Hi. Interesting. I'll handle such a situation for the future. > Wonder if next time such removals shouldn't be committed in 2 steps, > in one step everything but the ChangeLog would be removed, wait for > update_git_version and then in a separate commit just remove the > ChangeLog. Will take a look. Martin > > Anyway, to restore daily bumps I had to commit the following > patch, run update_git_version manually and then commit in > r13-3705-g89d0a14a1fdf89d38d9db1156ffde8c1b276823c the ChangeLog > entries for the removal manually. > > 2022-11-06 Jakub Jelinek <jakub@redhat.com> > > * gcc-changelog/git_update_version.py: Add > e4cba49413ca429dc82f6aa2e88129ecb3fdd943 to ignored commits. > > --- contrib/gcc-changelog/git_update_version.py.jj > +++ contrib/gcc-changelog/git_update_version.py > @@ -33,7 +33,8 @@ IGNORED_COMMITS = ( > '04a040d907a83af54e0a98bdba5bfabc0ef4f700', > '2e96b5f14e4025691b57d2301d71aa6092ed44bc', > '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4', > - '86d8e0c0652ef5236a460b75c25e4f7093cc0651') > + '86d8e0c0652ef5236a460b75c25e4f7093cc0651', > + 'e4cba49413ca429dc82f6aa2e88129ecb3fdd943') > > FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' > logging.basicConfig(level=logging.INFO, format=FORMAT, > > > Jakub >
--- contrib/gcc-changelog/git_update_version.py.jj +++ contrib/gcc-changelog/git_update_version.py @@ -33,7 +33,8 @@ IGNORED_COMMITS = ( '04a040d907a83af54e0a98bdba5bfabc0ef4f700', '2e96b5f14e4025691b57d2301d71aa6092ed44bc', '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4', - '86d8e0c0652ef5236a460b75c25e4f7093cc0651') + '86d8e0c0652ef5236a460b75c25e4f7093cc0651', + 'e4cba49413ca429dc82f6aa2e88129ecb3fdd943') FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT,