From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id 350C6395A436 for ; Thu, 17 Nov 2022 09:09:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 350C6395A436 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x52c.google.com with SMTP id z20so126991edc.13 for ; Thu, 17 Nov 2022 01:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=nY2LX3xC4DVwlpcyL3hRig5P95/fFy152lBfVxBFcFo=; b=b1aG26ImfEdFCJV8zHKbO5uhymLyYZHzjoHRVDM7iuWJDbLsknJDi+T6Cmavd5/gWR cA18BKw97lo0RWZ1a++aFVgiwUtLMRQgkhS/xji5ti2v4L4R++3DLq8+O/WEVLUqc0Bx 3OWErNFKGqqcmjDB9Ta6z+0BxQy7TWI39D98ln9Jb6SsTPjHYdssO3+Tsyr+h/IUS/mF H1g3qJ4/ZQyDWAvYZdvjf00fOzSqmt77l8XyQnkfBrziOe3UQmWiCWl0BDyhqEAkWEME 87UlgTGQLXBYv4qHvRQJPznrD6YbpjDp87GwejTpCV7hBxH9Ntmr+FGADVEFrccjBpXK BsWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nY2LX3xC4DVwlpcyL3hRig5P95/fFy152lBfVxBFcFo=; b=Xr8EYtXiYu0X8Ed24dsUdf0mePN5AGt+dU/xYseDWGGiNRUOmWHaK9rq6H72rPCDA/ vSKiUd4kCm5rBc5am6Ip1sDGBUzk+yORqhax8XTFRGA7RHMhhfIY3zLimEZU5lDJ0Ofc 64253ZvtV21QkLDNg0BwNC3gW1pxtDPt2+7C5rNTjURw8YyfkQV4CMxvl0TVtFLXahAB RfiBejroKcDX6xRC5dBvDFIYkTIY/nWngcGIUNLETsO9WlWObRw5KJUB4CmDwSa2tNFw Wx6v5DAJW+PYg+uhY/ydJvI5J8zmr6Uut84SS72YGHBBxZye158y8+SG4Pa8iOTWhaHO ZM/Q== X-Gm-Message-State: ANoB5pnrks4gpcTkbCuEVlg61cRi6gKEVxR/IqLJwvYmleqV9b2rniVS iCJHlKewruuGBReUM70HGGymngEbqE/PAQ6GyZsC9Zhe X-Google-Smtp-Source: AA0mqf6K2oJ3O6sAg0oCFZvGjNuCa+4J2UOb45BBANjJM311U+TkoKgPh7+EfSzzQ+a4lPMaaBTwTFplkhJGQj93Bd8= X-Received: by 2002:aa7:dbc7:0:b0:45f:b80f:1fe8 with SMTP id v7-20020aa7dbc7000000b0045fb80f1fe8mr1288790edt.118.1668676180008; Thu, 17 Nov 2022 01:09:40 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Thu, 17 Nov 2022 09:09:29 +0000 Message-ID: Subject: Re: gcc-commit-mklog fails To: Zopolis0 Cc: gcc-help Content-Type: multipart/alternative; boundary="000000000000f4627705eda6f218" X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000f4627705eda6f218 Content-Type: text/plain; charset="UTF-8" On Thu, 17 Nov 2022, 09:08 Jonathan Wakely, wrote: > > > On Thu, 17 Nov 2022, 01:31 Zopolis0 via Gcc-help, > wrote: > >> I was trying to add a changelog to my commits, starting with e4f70d4 >> on my msterstable branch >> (https://github.com/Zopolis4/gcj/commits/msterstable). >> >> I used an interactive rebase to get back to that commit and then soft >> reset it, and attempted to run git gcc-commit-mklog. This is the error >> I got: >> >> Traceback (most recent call last): >> File "/home/zopolis4/gcj/contrib/mklog.py", line 368, in >> output = generate_changelog(data, args.no_functions, >> File "/home/zopolis4/gcj/contrib/mklog.py", line 165, in >> generate_changelog >> diff = PatchSet(data) >> File "/usr/lib/python3/dist-packages/unidiff/patch.py", line 460, in >> __init__ >> self._parse(data, encoding=encoding, metadata_only=metadata_only) >> File "/usr/lib/python3/dist-packages/unidiff/patch.py", line 548, in >> _parse >> current_file._parse_hunk(line, diff, encoding, metadata_only) >> File "/usr/lib/python3/dist-packages/unidiff/patch.py", line 282, in >> _parse_hunk >> for diff_line_no, line in diff: >> File "/usr/lib/python3.10/codecs.py", line 322, in decode >> (result, consumed) = self._buffer_decode(data, self.errors, final) >> UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa0 in position >> 3125: invalid start byte >> >> What should I do? >> > > > You can just commit without using the mklog utility. Write the commit msg > by hand. > You should probably also figure out why you have invalid utf-8 in the diff, but that's up to you. --000000000000f4627705eda6f218--