https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40813
--- Comment #23 from David Cook <[email protected]> --- (In reply to Owen Leonard from comment #20) > (In reply to Chris Mathevet from comment #19) > > The error I get : sha1 missing or unusable > > First it was fine, then I got the sha1 missing error, then it worked again. > I don't understand it! If you look at the "Details" for "Bug 40813: (follow-up) Add some CSS, udpate navbar structure" you'll see these two lines: diff --git a/C4/Auth.pm b/C4/Auth.pm index 615ee53525a..8414922ef0f 100644 The hash on the left is the state you're moving FROM and the hash on the right is the state you're moving TO. So let's fetch upstream and rebase to make sure we're all up-to-date kohadev-koha@kohadevbox:koha(main)$ git fetch origin kohadev-koha@kohadevbox:koha(main)$ git rebase origin/main Current branch main is up to date. Now I check on that left most state: kohadev-koha@kohadevbox:koha(main)$ git show 615ee53525a fatal: ambiguous argument '615ee53525a': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' Uh oh! Fatal error! That means that commit hash does not exist in the upstream git repo "origin". @Owen: that means that the branch that contains your patch is using an ancestor that exists in your local repo but not the upstream repo. This could be due to a few things. It might be that someone has done an interactive rebase on the upstream "origin" which has resulted in new commit hashes. Or it could be that your branch has other commits before your patch which don't exist upstream. In any case, it's easy to fix. Do a "git fetch origin", rebase against "origin/main", and ensure repost the patches - including Kyle's patches, since your commit hash for Kyle's patches could be different to the ones posted here. I think the typical cause of the problem is probably that people apply the patches from another author, possibly do an interactive rebase or a git cherry-pick which yields different commit hashes, and then build their patch off that ancestor, but then only upload their patch with the change - not realising that they're based off a local-only ancestor. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
