diff options
| author | Waffle Lapkin <waffle.lapkin@gmail.com> | 2025-04-15 14:06:51 +0200 |
|---|---|---|
| committer | Waffle Lapkin <waffle.lapkin@gmail.com> | 2025-04-15 15:02:05 +0200 |
| commit | dda4d7bc44aa4909aae72cd38965a11ccf46c02e (patch) | |
| tree | 947d45e10fcaa138d90001837e7a1ab057fed077 /src/build_helper | |
| parent | 52f4b16075bf01d2c8f8539c26fb9b135967713f (diff) | |
slightly correct comments and diagnostics about checking modifications
I feel like they are still wrong, but maybe less so .-. The `info:` was unhelpful -- we only use upstream in CI nowdays.
Diffstat (limited to 'src/build_helper')
| -rw-r--r-- | src/build_helper/src/git.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs index 693e0fc8f46..f5347c30824 100644 --- a/src/build_helper/src/git.rs +++ b/src/build_helper/src/git.rs @@ -114,7 +114,9 @@ fn git_upstream_merge_base( Ok(output_result(git.arg("merge-base").arg(&updated_master).arg("HEAD"))?.trim().to_owned()) } -/// Searches for the nearest merge commit in the repository that also exists upstream. +/// Searches for the nearest merge commit in the repository. +/// +/// **In CI** finds the nearest merge commit that *also exists upstream*. /// /// It looks for the most recent commit made by the merge bot by matching the author's email /// address with the merge bot's email. @@ -165,7 +167,7 @@ pub fn get_closest_merge_commit( Ok(output_result(&mut git)?.trim().to_owned()) } -/// Returns the files that have been modified in the current branch compared to the master branch. +/// Returns the files that have been modified in the current branch compared to the last merge. /// The `extensions` parameter can be used to filter the files by their extension. /// Does not include removed files. /// If `extensions` is empty, all files will be returned. |
