File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Expand file tree Collapse file tree 1 file changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -552,7 +552,7 @@ static struct ref *get_ref_map(struct remote *remote,
552
552
if (remote &&
553
553
(remote -> fetch .nr ||
554
554
/* Note: has_merge implies non-NULL branch->remote_name */
555
- (has_merge && !strcmp (branch -> remote_name , remote -> name )))) {
555
+ (has_merge && branch && !strcmp (branch -> remote_name , remote -> name )))) {
556
556
for (i = 0 ; i < remote -> fetch .nr ; i ++ ) {
557
557
get_fetch_map (remote_refs , & remote -> fetch .items [i ], & tail , 0 );
558
558
if (remote -> fetch .items [i ].dst &&
@@ -570,6 +570,7 @@ static struct ref *get_ref_map(struct remote *remote,
570
570
* Note: has_merge implies non-NULL branch->remote_name
571
571
*/
572
572
if (has_merge &&
573
+ branch &&
573
574
!strcmp (branch -> remote_name , remote -> name ))
574
575
add_merge_config (& ref_map , remote_refs , branch , & tail );
575
576
} else if (!prefetch ) {
You can’t perform that action at this time.
0 commit comments