Merge branch 'ab/reflog-prep-fix'

gitster · gitster · commit 7f7d1ad3e0b1 · 2022-03-23T14:09:30.000-07:00
Regression fix.

* ab/reflog-prep-fix:
  reflog: don't be noisy on empty reflogs
diff --git a/reflog.c b/reflog.c
@@ -334,6 +334,8 @@ void reflog_expiry_prepare(const char *refname,
 		cb->unreachable_expire_kind = UE_HEAD;
 	} else {
 		commit = lookup_commit(the_repository, oid);
+		if (commit && is_null_oid(&commit->object.oid))
+			commit = NULL;
 		cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
 	}
 
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
@@ -423,4 +423,13 @@ test_expect_success 'expire with multiple worktrees' '
 	)
 '
 
+test_expect_success REFFILES 'empty reflog' '
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	test_commit -C empty A &&
+	>empty/.git/logs/refs/heads/foo &&
+	git -C empty reflog expire --all 2>err &&
+	test_must_be_empty err
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,8 @@ void reflog_expiry_prepare(const char *refname,`
`334`	`334`	`cb->unreachable_expire_kind = UE_HEAD;`
`335`	`335`	`} else {`
`336`	`336`	`commit = lookup_commit(the_repository, oid);`
	`337`	`+ if (commit && is_null_oid(&commit->object.oid))`
	`338`	`+ commit = NULL;`
`337`	`339`	`cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;`
`338`	`340`	`}`
`339`	`341`
Original file line number	Diff line number	Diff line change
`@@ -423,4 +423,13 @@ test_expect_success 'expire with multiple worktrees' '`
`423`	`423`	`)`
`424`	`424`	`'`
`425`	`425`
	`426`	`+test_expect_success REFFILES 'empty reflog' '`
	`427`	`+ test_when_finished "rm -rf empty" &&`
	`428`	`+ git init empty &&`
	`429`	`+ test_commit -C empty A &&`
	`430`	`+ >empty/.git/logs/refs/heads/foo &&`
	`431`	`+ git -C empty reflog expire --all 2>err &&`
	`432`	`+ test_must_be_empty err`
	`433`	`+'`
	`434`	`+`
`426`	`435`	`test_done`