Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    David Macek
    @elieux
    Anyway, that's enough explanation. Thanks.
    Johannes Schindelin
    @dscho
    But v2.30.2 was superseded by v2.31.0-rc2 (as far as mingw-w64-git goes) in the meantime, anyway...

    Pacman complained that it's a downgrade..

    Oh right, I didn't think of that.

    It shouldn't have been a big deal, but I was a bit too tired to do v2.30.2 and v2.31.0-rc2 on the same day (besides, I needed to wait for a GCM Core update before I could release v2.31.0-rc2).
    Brent Arias
    @brentarias

    Hey all, I have done a git merge --no-commit --no-ff {my_branch}. I decided I don't want the result, so I typed git merge --abort. I get this error:

    error: Entry 'O365OutlookConnector.Test/O365OutlookGeneratorTest.cs' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'HEAD'

    What can I do?

    Brent Arias
    @brentarias
    Never mind. I fixed it by unstaging all changes, then again trying git merge --abort.
    pjujeczko
    @pjujeczko
    Hello @elieux . I got problems after istalling git for windows in my MSYS2. I ended up without Pacman... I thought I was doing steps 1-5 of https://github.com/git-for-windows/git/wiki/Install-inside-MSYS2-proper right, but then I realised I was using wrong shell (Mingw64 instead of Msys). Msys2 was up to date before that, I use win10. Is it possible to restore Pacman without reinstalling the whole Msys2?
    David Macek
    @elieux
    I don't think the used shell would have a significant effect on the process.
    Did you get any errors during the process?
    pjujeczko
    @pjujeczko
    No, there were no errors. Step 5 - the console has closed and after that there was no pacman;)
    One more thing - in step 4 instead of "pacman -Syyuu" i wrote "pacman -Syu", but as I said the system was upgraded that same day
    David Macek
    @elieux
    How do you know you don't have Pacman anymore?
    You can download and extract it from https://repo.msys2.org/msys/x86_64/pacman-5.2.2-9-x86_64.pkg.tar.zst.
    @pjujeczko
    pjujeczko
    @pjujeczko
    there is no pacman in /usr/bin - command is deleted. What's more - I've installed pacman from the repo (msys2-keyring-1~20210213-1-any.pkg.tar.zst,
    pacman-5.2.2-13-x86_64.pkg.tar.zst,
    pacman-mirrors-20210227-1-any.pkg.tar.zst), but after extracting pacman, I can use it once before it gets self-deleted from /usr/bin with such errors:
    error: GPGME error: Invalid crypto engine
    error: GPGME error: Invalid crypto engine
    error: GPGME error: Invalid crypto engine
    error: GPGME error: Invalid crypto engine
    error: database 'mingw32' is not valid (invalid or corrupted database (PGP signature))
    error: database 'mingw64' is not valid (invalid or corrupted database (PGP signature))
    error: database 'msys' is not valid (invalid or corrupted database (PGP signature))
    error: database 'git-for-windows' is not valid (invalid or corrupted database (PGP signature))
    pjujeczko
    @pjujeczko
    @elieux
    David Macek
    @elieux
    I don't think Pacman will delete itself unless you tell it to.
    This is something else deleting it.
    Check BLODA.
    https://cygwin.com/faq/faq.html#faq.using.bloda
    pjujeczko
    @pjujeczko
    Ok, thanks
    pjujeczko
    @pjujeczko
    You're right, I had to add exception for my Msys2 location in my anti-virus soft (Avast, free). It was the cause of pacman disappearance. However after untaring the pacman (in root directory by $ tar -x -I zstd -vf ~/pacman/pacman-5.2.2-13-x86_64.pkg.tar.zst) I get same errors. I tried to install libgpgme and mingw-w64-gpgme packages that same way, but it makes no difference.
    @elieux
    David Macek
    @elieux
    Invalid crypto engine?
    Can we do something like TeamViewer? I'm quite tired to formulate hypotheses in a useful way.
    pjujeczko
    @pjujeczko
    @elieux Ok, I'll try to manage myself, maybe I'll just reinstall Msys2 and the packages. Since it's something that may be related to the antivirus soft and maybe it would need to be suppressed somehow, I'd prefer not to be giving the TeamViewer access. But anyway, thank you for your help, it seems that it was Avast that spoiled the things.
    David Macek
    @elieux
    If you search for "error: GPGME error: Invalid crypto engine", you should get results with various advice related to MSYS2.
    pjujeczko
    @pjujeczko
    Seems it works now - I installed the msys2-base and needed to add sqlite and libsqlite packages, then GPGME stopped moaning and I reinstalled the keys (https://www.msys2.org/news/#2020-06-29-new-packagers) and was able to get the system working. Thanks a lot, David, you're guys doing a great job keeping Msys2 working!
    Brent Arias
    @brentarias

    Hey! I made a branch that is pointing to remote "Bravo". I have successfully pushed to the "Bravo" remote. Now I want to push that same branch to a different repo "Charlie". I've tried this:

    git branch --set-upstream-to Charlie myBranch

    It didn't work. Instead it told me that Charlie is now tracking against the master branch. How do I fix this?

    David Macek
    @elieux
    @brentarias, git push Charlie myBranch:myBranch?
    Brent Arias
    @brentarias
    @elieux I did get it fixed that same day. I don't recall what I did.
    New question. How is this possible?
    image.png
    It says I'm behind by one...but when I try to pull...it says I'm up to date.
    David Macek
    @elieux
    I'm not actually sure what exactly is up to date there, but it sure looks suspicious.
    Johannes Schindelin
    @dscho
    I bet there's a hook at work. Running this using GIT_TRACE=1 might shed some light into the puzzle.
    Johannes Schindelin
    @dscho
    Funnily enough, I just wrote an MCVE for a different issue, and ran into this error message. Here is the MCVE: https://github.com/git-for-windows/git/issues/3192#issuecomment-825549677. The message seems to stem from https://github.com/git/git/blob/v2.31.1/merge-recursive.c#L3434-L3435, where it essentially says that the tree did not have to be changed (because HEAD, MERGE_HEAD as well as the merge base essentially refer to the empty tree as far as merge-recursive is concerned). So I'd look into that, if I were you, and if you find a good way to reproduce this, report it to the Git mailing list at git@vger.kernel.org (because this is not a Windows-specific issue; please do make sure not to write any HTML mail, as they bounce, by design).
    Mayank Aggarwal
    @Mayank0255

    Hello everyone

    I am Mayank Aggarwal, a 3rd year student pursuing Btech in Information Technology from Manipal University Jaipur.

    I am here to grow as a developer with a set of like minded people

    Check me out at

    Portfolio: https://mayank0255.github.io/
    GitHub: https://github.com/Mayank0255
    Linkedin: https://www.linkedin.com/in/mayank-aggarwal-14301b168

    Rahul Awasthi
    @RahulAwasthi314
    how can I push my local git repository to github?
    David Macek
    @elieux
    Did you try GitHub help pages?
    Rahul Awasthi
    @RahulAwasthi314
    Yes I resolved the issue now. Thanks for help
    Brent Arias
    @brentarias
    I have a git repo, with a git submodule, that has a merge conflict I don't know how to resolve:
    image.png
    Normally when there is a file conflict, I'm given the choice between "accept current" or "accept incoming". In this case I'm not given any option...nor a notation that makes sense to me. Ideas?
    Brent Arias
    @brentarias
    The only clue I have is that git status gives the following information:
    Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   External/NeoAgent/Extractor
    Brent Arias
    @brentarias
    Ok, based on a Stackoverflow answer(s) I found, I tried a solution which seems to have worked:
    git reset HEAD External/NeoAgent/Extractor
    Ivan Shapovalov
    @intelfx:intelfx.name
    [m]
    Hey.
    I have a question about the git-for-windows installation process into an existing msys2 copy from this wiki page.
    Do I have to install git-extra? What exactly am I losing by not installing it? It seems to convert my msys2 installation into a git-for-windows sdk, and this process goes not very smoothly (e. g. it makes msys2 spit out a bunch of errors whenever I launch a shell).
    (I was told to ping elieux (David Macek))
    David Macek
    @elieux
    Hey.
    I can try to write down what it does in detail. But a quick and unverified answer would be "no, you don't have to".
    David Macek
    @elieux
    @intelfx:intelfx.name It's done.