aboutsummaryrefslogtreecommitdiff
path: root/src/update/mod.rs
diff options
context:
space:
mode:
authorMax Audron <audron@cocaine.farm>2025-03-26 15:19:00 +0100
committerMax Audron <audron@cocaine.farm>2025-03-26 15:19:00 +0100
commit86235efcf77346ff4b012497004dccc7380d70ac (patch)
treea272a57e717b577e6de1231ea873368cf33a2449 /src/update/mod.rs
parentfix wrong ref being updated on checkout if branch contained slash (diff)
delete files removed from index during checkout
Diffstat (limited to '')
-rw-r--r--src/update/mod.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/update/mod.rs b/src/update/mod.rs
index e3cd36a..e5e9f4c 100644
--- a/src/update/mod.rs
+++ b/src/update/mod.rs
@@ -46,13 +46,14 @@ impl Repo {
let _fetched = self.fetch()?;
let (remote, head) = self.default_remote_head()?;
debug!("default remote and head: {:?} {:?}", remote, head);
- // TODO do not update if there are unpushed commits
- self.update_default_branch_ref(&remote, head)?;
- debug!("updated default branch reference");
// TODO check out only if the default branch is currently checked out
self.checkout(&remote, head, &mut progress)?;
debug!("finished checkout");
+ // TODO do not update if there are unpushed commits
+ self.update_default_branch_ref(&remote, head)?;
+ debug!("updated default branch reference");
+
// let merged = repo.branches(Some(BranchType::Local))?
// .filter_map(|x| x.ok())
// .try_fold(false, |mut merged, (mut branch, _)| {
title='2021-09-07 14:07:18 +0200'>2021-09-07remove test channel from prod configMax Audron-1/+1 2021-09-07add about commandMax Audron-3/+20 2021-09-07add stuff to ignore for git and containersMax Audron-0/+3 2021-09-07add cargo chef to container build to utilize cachingMax Audron-8/+12 2021-09-07handle CTCP ACTION in sed moduleMax Audron-2/+16 2021-09-07put benchmark behind feature flag we can compile using stable rustMax Audron-7/+17 2021-09-07handle error cases in sed moduleMax Audron-8/+15 2021-06-29add rmr to channels1.3.2Max Audron-1/+1 2021-06-28>.>: add . as eyeMax Audron-1/+1 2021-06-28add lmr to channels1.3.1Max Audron-1/+1 2021-06-23rewrite sed regex to work cross channelMax Audron-115/+141 2021-06-23add required metadata for publishing to macros crateMax Audron-5/+12 2021-06-23add ability to use path and dotted syntax for functionsMax Audron-8/+39 2021-06-21publish macros subcrateMax Audron-20/+20 2021-06-13release version 1.2.1Max Audron-2/+2 2021-06-13fix crash on message only containing whitespaceMax Audron-1/+4 2021-06-11Release version 1.2.01.2.0Max Audron-2/+2 2021-06-06make pet more compactR0flcopt3r/catinator-pet-commandMax Audron-5/+5 2021-06-05feat: adds pet command.R0flcopt3r-0/+90 2021-06-05feat: send actionR0flcopt3r-1/+9 2021-06-05release version 1.1.0Max Audron-2/+2 2021-06-05document proc macrosMax Audron-4/+97 2021-06-05add intensifyMax Audron-3/+27 2021-06-05add privmsg macroMax Audron-2/+40 2021-06-05fix jb remote urlsMax Audron-4/+4 2021-06-05remove egress gateway configMax Audron-10/+0 2021-06-05update tanka dependenciesMax Audron-8/+8 2021-06-05fix init container nameMax Audron-1/+1 2021-06-05fix tanka dependency pathMax Audron-8/+8 2021-06-05switch to https url for tanka util libMax Audron-2/+2 2021-06-05bump version to 1.0.2Max Audron-2/+2 2021-06-05add tanka ci configurationMax Audron-1/+1 2021-06-05ready tanka deploy for CIMax Audron-32/+69 2021-06-05remove tanka vendoringMax Audron-27651/+0 2021-05-26Release 1.0.1Max Audron-3/+3 2021-05-26fix log breaking once buffer fullMax Audron-2/+33 2021-05-16add deployment stuffMax Audron-6/+27786 2021-05-15add container buildMax Audron-2/+35