From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:21 +0000 (-0700)
Subject: Merge branch 'nd/tree-walk-with-repo'
X-Git-Tag: v2.23.0-rc0~34
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1eb0a12ec3934b7fc398b118806fdf7550ae636e

Merge branch 'nd/tree-walk-with-repo'

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()
---

1eb0a12ec3934b7fc398b118806fdf7550ae636e
diff --cc sequencer.c
index 66126e020d,64428ac28f..34ebf8ed94
--- a/sequencer.c
+++ b/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))