]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ly/do-not-localize-bug-messages'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2025 17:44:40 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2025 17:44:40 +0000 (10:44 -0700)
Code clean-up.

* ly/do-not-localize-bug-messages:
  BUG(): remove leading underscore of the format string

1  2 
builtin/mktag.c
builtin/worktree.c
pack-bitmap-write.c

diff --cc builtin/mktag.c
Simple merge
Simple merge
index 7f400ee01213da1489257560cd39a70a06bb4116,23ec32a9927eaddd95342249f523c0ea597fd93a..56960e6ad7600a2ca363b952933ce20f26002e03
@@@ -1087,8 -1054,8 +1087,8 @@@ void bitmap_writer_finish(struct bitmap
                                         oid_access);
  
                if (commit_pos < 0)
-                       BUG(_("trying to write commit not in index"));
+                       BUG("trying to write commit not in index");
 -              stored->commit_pos = commit_pos;
 +              stored->commit_pos = commit_pos + base_objects;
        }
  
        write_selected_commits_v1(writer, f, offsets);