Skip to content
This repository has been archived by the owner on Apr 29, 2024. It is now read-only.

Patch fixes #451

Merged
merged 3 commits into from
Mar 19, 2023
Merged

Patch fixes #451

merged 3 commits into from
Mar 19, 2023

Conversation

cloudhead
Copy link
Contributor

See commits.

None,
None,
)?;
working.find_commit(patch_head.into())?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe move this code into a private method? That way the condition and resulting actions are clear.

@slack-coder
Copy link
Contributor

Otherwise 👍

The description is not actually optional, so don't return an `Option`.
Since the patch may not have been pulled into the working copy,
we shouldn't rely on it for displaying patch information.
Before this change, `rad patch checkout` would fail if the patch commits
were not in the working copy.
@cloudhead cloudhead merged commit 5ccf380 into master Mar 19, 2023
@cloudhead cloudhead deleted the cloudhead/patch branch March 19, 2023 14:33

pub fn run(
storage: &Repository,
git_workdir: &git::raw::Repository,
stored: &Repository,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the rename, out of interest?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

storage is confusing when it doesn't refer to Storage, no?

I think a nice convention if there are two repositories is stored for the stored copy and working for the working copy. That was the idea.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, that makes sense! I only noticed the working copy param after I sent off the comment, but you confirmed my hunch 😄

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants