Merge branch 'nd/tree-walk-with-repo'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:21 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:21 +0000 (11:30 -0700)
The tree-walk API learned to pass an in-core repository
instance throughout more codepaths.

* nd/tree-walk-with-repo:
  t7814: do not generate same commits in different repos
  Use the right 'struct repository' instead of the_repository
  match-trees.c: remove the_repo from shift_tree*()
  tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
  tree-walk.c: remove the_repo from get_tree_entry()
  tree-walk.c: remove the_repo from fill_tree_descriptor()
  sha1-file.c: remove the_repo from read_object_with_reference()

1  2 
blame.c
builtin/pack-objects.c
builtin/rebase.c
builtin/reset.c
cache.h
fast-import.c
sequencer.c
sha1-name.c
unpack-trees.c

diff --cc blame.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/reset.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc sequencer.c
@@@ -3841,14 -3733,11 +3841,14 @@@ static int pick_commits(struct reposito
                        unlink(rebase_path_author_script());
                        unlink(rebase_path_stopped_sha());
                        unlink(rebase_path_amend());
-                       unlink(git_path_merge_head(the_repository));
+                       unlink(git_path_merge_head(r));
                        delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
  
 -                      if (item->command == TODO_BREAK)
 +                      if (item->command == TODO_BREAK) {
 +                              if (!opts->verbose)
 +                                      term_clear_line();
                                return stopped_at_head(r);
 +                      }
                }
                if (item->command <= TODO_SQUASH) {
                        if (is_rebase_i(opts))
diff --cc sha1-name.c
Simple merge
diff --cc unpack-trees.c
Simple merge