]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/the-repository'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Jan 2025 16:44:54 +0000 (08:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jan 2025 16:44:54 +0000 (08:44 -0800)
More code paths have a repository passed through the callchain,
instead of assuming the primary the_repository object.

* ps/the-repository:
  match-trees: stop using `the_repository`
  graph: stop using `the_repository`
  add-interactive: stop using `the_repository`
  tmp-objdir: stop using `the_repository`
  resolve-undo: stop using `the_repository`
  credential: stop using `the_repository`
  mailinfo: stop using `the_repository`
  diagnose: stop using `the_repository`
  server-info: stop using `the_repository`
  send-pack: stop using `the_repository`
  serve: stop using `the_repository`
  trace: stop using `the_repository`
  pager: stop using `the_repository`
  progress: stop using `the_repository`

1  2 
builtin/blame.c
builtin/index-pack.c
builtin/log.c
builtin/receive-pack.c
builtin/remote.c
bulk-checkin.c
credential.c
credential.h
oss-fuzz/fuzz-parse-attr-line.c
pack-bitmap.c

diff --cc builtin/blame.c
Simple merge
Simple merge
diff --cc builtin/log.c
index a4f41aafcae069541ee987dc94d245edfe9787a8,3a6a3362f3c36ee257215e79cf40085f76c9efb3..e41f88945eb4ed3dc2ce247c42f45d61cbf52692
@@@ -2498,15 -2495,13 +2498,16 @@@ int cmd_format_patch(int argc
        rev.add_signoff = cfg.do_signoff;
  
        if (show_progress)
-               progress = start_delayed_progress(_("Generating patches"), total);
+               progress = start_delayed_progress(the_repository,
+                                                 _("Generating patches"), total);
 -      while (0 <= --nr) {
 +      for (i = 0; i < nr; i++) {
 +              size_t idx = nr - i - 1;
                int shown;
 -              display_progress(progress, total - nr);
 -              commit = list[nr];
 -              rev.nr = total - nr + (start_number - 1);
 +
 +              display_progress(progress, total - idx);
 +              commit = list[idx];
 +              rev.nr = total - idx + (start_number - 1);
 +
                /* Make the second and subsequent mails replies to the first */
                if (cfg.thread) {
                        /* Have we already had a message ID? */
Simple merge
Simple merge
diff --cc bulk-checkin.c
Simple merge
diff --cc credential.c
Simple merge
diff --cc credential.h
Simple merge
Simple merge
diff --cc pack-bitmap.c
Simple merge