Skip to content

Properly handle branch, default to main #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtpio wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Properly handle branch, default to main #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed192a
Properly handle `ref_branch`, default to `main`
jtpio Dec 11, 2025
1386385
update tests
jtpio Dec 11, 2025
9924b21
fix
jtpio Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions github_activity/github_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,9 +690,11 @@ def filter_ignored(userlist):
this_md = f"- {ititle} [#{irowdata['number']}]({irowdata['url']}) ({contributor_list})"
items["md"].append(this_md)

# Get functional GitHub references: any git reference or master@{YY-mm-dd}
# Get functional GitHub references: any git reference or {branch}@{YY-mm-dd}
# Use the branch parameter if provided, otherwise default to "main"
ref_branch = branch or "main"
if closed_prs.size > 0 and not data.since_is_git_ref:
since = f"master@{{{data.since_dt:%Y-%m-%d}}}"
since = f"{ref_branch}@{{{data.since_dt:%Y-%m-%d}}}"
closest_date_start = closed_prs.loc[
abs(
pd.to_datetime(closed_prs["closedAt"], utc=True)
Expand All @@ -704,7 +706,7 @@ def filter_ignored(userlist):
since_ref = since

if closed_prs.size > 0 and not data.until_is_git_ref:
until = f"master@{{{data.until_dt:%Y-%m-%d}}}"
until = f"{ref_branch}@{{{data.until_dt:%Y-%m-%d}}}"
closest_date_stop = closed_prs.loc[
abs(
pd.to_datetime(closed_prs["closedAt"], utc=True)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"github-activity {org}/{repo} -s 2021-01-01 -u 2021-01-15 -o {path_output}",
"cli_w_parts",
),
# CLI with default branch
# CLI with explicit branch filter (using master since that was likely the name in 2021)
(
"github-activity {org}/{repo} -s 2021-01-01 -u 2021-01-15 -o {path_output} -b master",
"cli_def_branch",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli/cli_no_target.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# master@{2021-01-01}...master@{2021-01-15}
# main@{2021-01-01}...main@{2021-01-15}

([full changelog](https://github.com/executablebooks/github-activity/compare/c740a454def057304556675ce7694dc0f2eb6c88...c740a454def057304556675ce7694dc0f2eb6c88))

Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli/cli_no_target_pyproject.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##### master@{2021-01-01}...master@{2021-01-15}
##### main@{2021-01-01}...main@{2021-01-15}

([full changelog](https://github.com/executablebooks/github-activity/compare/c740a454def057304556675ce7694dc0f2eb6c88...c740a454def057304556675ce7694dc0f2eb6c88))

Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli/cli_w_parts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# master@{2021-01-01}...master@{2021-01-15}
# main@{2021-01-01}...main@{2021-01-15}

([full changelog](https://github.com/executablebooks/github-activity/compare/c740a454def057304556675ce7694dc0f2eb6c88...c740a454def057304556675ce7694dc0f2eb6c88))

Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli/cli_w_url.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# master@{2021-01-01}...master@{2021-01-15}
# main@{2021-01-01}...main@{2021-01-15}

([full changelog](https://github.com/executablebooks/github-activity/compare/c740a454def057304556675ce7694dc0f2eb6c88...c740a454def057304556675ce7694dc0f2eb6c88))

Expand Down
Loading