non-fast-forward update #669

New Issue

ammaratef45 · 2025-09-17T02:30:27Z

ammaratef45 commented

2025-09-17 02:30:27 +00:00

This problem started happening after I upgraded to 0.11.0-beta

My workaround was to build abra from source (using main branch) and using that for app new command then continuing to use 0.11.0-beta for other operations as normal

Error example:

abra app new minio -d                                                    
DEBU <cli/run.go:137> abra version: 0.11.0-beta, commit: 1c4abcf1, lang: en
DEBU <git/branch.go:99> successfully checked out refs/heads/main in /Users/ammarhussein/.abra/catalogue
FATA <internal/validate.go:25> non-fast-forward update

The problem is not limited to minio recipe, few other recipes including keycloak and writefreely experienced the same issue when I tested them out

This problem started happening after I upgraded to `0.11.0-beta` My workaround was to build abra from source (using main branch) and using that for `app new` command then continuing to use `0.11.0-beta` for other operations as normal Error example: ``` abra app new minio -d DEBU <cli/run.go:137> abra version: 0.11.0-beta, commit: 1c4abcf1, lang: en DEBU <git/branch.go:99> successfully checked out refs/heads/main in /Users/ammarhussein/.abra/catalogue FATA <internal/validate.go:25> non-fast-forward update ``` The problem is not limited to minio recipe, few other recipes including keycloak and writefreely experienced the same issue when I tested them out

ammaratef45 added the

bug

label 2025-09-17 02:30:27 +00:00

3wordchant commented

2025-09-17 03:47:06 +00:00

@ammaratef45 does it help to manually sync the local catalogue?

cd ~/.abra/catalogue && git pull --rebase && git push

This happens to me if I run abra catalogue generate and then make a commit in the catalogue repo and don't push. Unless something like that happened to you as well then this seems like a pretty gnarly bug!

And either way abra could probably suggest a fix in this situation.

@ammaratef45 does it help to manually sync the local catalogue? `cd ~/.abra/catalogue && git pull --rebase && git push` This happens to me if I run `abra catalogue generate` and then make a commit in the catalogue repo and don't push. Unless something like that happened to you as well then this seems like a pretty gnarly bug! And either way abra could probably suggest a fix in this situation.

ammaratef45 commented

2025-09-17 03:57:44 +00:00

Huh, I got CONFLICT (content): Merge conflict in recipes.json, I deleted the catalogue and let abra get a fresh copy of it for me and it is all good now <3 (maybe we can make this a recovery step? prompt the user for consent and deleting the catalogue repo then cloning it again)

Huh, I got `CONFLICT (content): Merge conflict in recipes.json`, I deleted the catalogue and let abra get a fresh copy of it for me and it is all good now <3 (maybe we can make this a recovery step? prompt the user for consent and deleting the catalogue repo then cloning it again)

👀 1

decentral1se commented

2025-09-18 08:01:11 +00:00

Hmmm interesting yeh. I would imagine this has not much to do with abra and more to do with #669 (comment). And yes, in general, the simplest fix (if you don't have unstaged/uncommitted changes) is always to just delete it and have abra clone it again.

I'd rather slowly try to migrate any catalogue functionality away from daily operations of abra than patch up this kind of stuff with more hard to test interactive prompts. This is a mid/long-term thing.

I think for now, we can intervene into the git plumbing functions in abra and try to give a better error message.

Hmmm interesting yeh. I would imagine this has not much to do with `abra` and more to do with https://git.coopcloud.tech/toolshed/abra/issues/669#issuecomment-27169. And yes, in general, the simplest fix (if you don't have unstaged/uncommitted changes) is always to just delete it and have abra clone it again. I'd rather slowly try to migrate any catalogue functionality away from daily operations of `abra` than patch up this kind of stuff with more hard to test interactive prompts. This is a mid/long-term thing. I think for now, we can intervene into the git plumbing functions in `abra` and try to give a better error message.

decentral1se added this to the Abra v0.12 project 2025-09-18 08:02:18 +00:00

decentral1se moved this to Prioritised in Abra v0.12 on 2025-09-29 06:57:43 +00:00

decentral1se referenced this issue from a commit

2025-10-01 07:10:00 +00:00

fix: point to the catalogue

decentral1se referenced this issue

2025-10-01 07:11:06 +00:00

fix: point to the catalogue #676

decentral1se closed this issue

2025-10-01 07:11:21 +00:00

decentral1se moved this to Done in Abra v0.12 on 2025-10-01 07:11:30 +00:00

Sign in to join this conversation.