diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-07 14:12:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-07 14:12:56 -0700 |
| commit | 7310e539ada2b368e1c7243734ee7316639814f2 (patch) | |
| tree | ae96aaaa39d398cd5a3f63c593cc9826be78d25c /builtin/pull.c | |
| parent | 8b6f19ccfc3aefbd0f22f6b7d56ad6a3fc5e4f37 (diff) | |
| parent | ca62f524c1eaef606b5c312de53ef7c4d9eefa4f (diff) | |
| download | git-7310e539ada2b368e1c7243734ee7316639814f2.tar.gz | |
Merge branch 'jk/submodule-remote-lookup-cleanup'
Updating submodules from the upstream did not work well when
submodule's HEAD is detached, which has been improved.
* jk/submodule-remote-lookup-cleanup:
submodule: look up remotes by URL first
submodule: move get_default_remote_submodule()
submodule--helper: improve logic for fallback remote name
remote: remove the_repository from some functions
dir: move starts_with_dot(_dot)_slash to dir.h
remote: fix tear down of struct remote
remote: remove branch->merge_name and fix branch_release()
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 6e72a2e9a4..c593f324fe 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -490,7 +490,7 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs } else fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched."), - *curr_branch->merge_name); + curr_branch->merge[0]->src); exit(1); } |