Skip to content

RFC: Push diffs in Git before telling GitHub about it #280

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

Merged
merged 1 commit into from
Mar 28, 2025
Merged

RFC: Push diffs in Git before telling GitHub about it #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 24 additions & 23 deletions src/ghstack/submit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,6 +1479,30 @@ def push_updates(
push_branches: List[str] = []
force_push_branches: List[str] = []

for s in reversed(diffs_to_submit):
# It is VERY important that we do base updates BEFORE real
# head updates, otherwise GitHub will spuriously think that
# the user pushed a number of patches as part of the PR,
# when actually they were just from the (new) upstream
# branch

for diff, b in s.push_branches:
if b == "orig":
q = force_push_branches
elif b == "base":
q = base_push_branches
else:
q = push_branches
q.append(push_spec(diff, branch(s.username, s.ghnum, b)))
# Careful! Don't push master.
# TODO: These pushes need to be atomic (somehow)
if base_push_branches:
self._git_push(base_push_branches)
if push_branches:
self._git_push(push_branches, force=self.force)
if force_push_branches:
self._git_push(force_push_branches, force=True)

for s in reversed(diffs_to_submit):
# NB: GraphQL API does not support modifying PRs
assert not s.closed
Expand Down Expand Up @@ -1516,29 +1540,6 @@ def push_updates(
body=stack_desc,
)

# It is VERY important that we do base updates BEFORE real
# head updates, otherwise GitHub will spuriously think that
# the user pushed a number of patches as part of the PR,
# when actually they were just from the (new) upstream
# branch

for diff, b in s.push_branches:
if b == "orig":
q = force_push_branches
elif b == "base":
q = base_push_branches
else:
q = push_branches
q.append(push_spec(diff, branch(s.username, s.ghnum, b)))
# Careful! Don't push master.
# TODO: These pushes need to be atomic (somehow)
if base_push_branches:
self._git_push(base_push_branches)
if push_branches:
self._git_push(push_branches)
if force_push_branches:
self._git_push(force_push_branches, force=True)

# Report what happened
def format_url(s: DiffMeta) -> str:
return "https://{github_url}/{owner}/{repo}/pull/{number}".format(
Expand Down