Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    hisnawi
    @hisnawi
    Did I get that right?
    Noam Postavsky
    @npostavs
    yeah
    hisnawi
    @hisnawi
    one more thing: is there a difference between [true] or [pull.rebase:true]?
    Noam Postavsky
    @npostavs
    I think it depends on context. I'm not sure if we're looking at the same place
    hisnawi
    @hisnawi
    image.png
    Noam Postavsky
    @npostavs
    hmm, the magit version on my current box is a little old, maybe the display was tweaked since then.
    hisnawi
    @hisnawi
    What do you have? only true?
    Noam Postavsky
    @npostavs
    oh, oops, I was confused. I actually had false, and I just assumed it would show true in the other case. But after setting the same config you mentioned above I have pull.rebase:true as well.
    hisnawi
    @hisnawi
    @naom when I set the configuration rebase to be true and not touch the -r option and when checking the magit-process buffer Is till don't see -rebase being applied on the pull! It is only when choosing the -r option that I see rebase getting applied
    Noam Postavsky
    @npostavs
    @hisnawi well, you won't see -r on the command line in *magit-process buffer, if that's what you mean by "see -rebase being applied". But git will look at the configuration value you set if there is no -r or --rebase option passed.
    hisnawi
    @hisnawi

    When not touching the -r option in the magit-process buffer I see:
    0 git … pull origin refs/heads/master

    Regardless of the configuration option [true or not]

    but when choosing the -r option before the pull I see:
    0 git … pull --rebase origin refs/heads/master

    This says rebasing is getting only applied with the -r option and not when you have your configuration defaults set to true rebasing

    Noam Postavsky
    @npostavs
    @hisnawi no, it just says magit only passes the -r option if you ask it to. In case you don't pass the option, git will look at your pull.rebase setting.
    hisnawi
    @hisnawi
    So you are saying if I have the configuration as true rebase, then even though it doesn't explicitly show --rebase in magit-process, rebasing is still performed. correct?
    Noam Postavsky
    @npostavs
    yeah
    hisnawi
    @hisnawi
    Thanks
    Ag Ibragimov
    @agzam
    how do you limit git log to multiple authors? e.g. how do make magit run git log --author='\(John\)\|\(Jean\)'?
    Ag Ibragimov
    @agzam
    ah, nevermind, Ivy been giving me shit instead what I wanted. Literally just needed to press -A and type that
    Andrés Moreno
    @andresfib
    Hi all, my magit in spacemacs (macos) is failing to recognize my git repositories, and I wonder if you could help.
    Say I open a project file via the projectile command, and check the magit-status of the project, I will get the dialog to create a new repository instead of the status of the existing repository. Any hints on what to investigate will help. I have tried to specify the magit-repo-dirs with no luck.
    Grant Shangreaux
    @gcentauri
    @andresfib that is very strange, it should "just work" are you sure you're in an existing repo when you run magit-status?
    Paolo G. Giarrusso
    @Blaisorblade
    @andresfib if the above fails, can you check that spacemacs does find git? on mac you need some work to make Emacs see the correct PATH (spacemacs has special support for it, but you still need some setup)
    Andrés Moreno
    @andresfib
    it had been working for a long time for me, I am committing and pushing as normal from the terminal
    Paolo G. Giarrusso
    @Blaisorblade
    @andresfib yeah, Emacs doesn’t see the PATH you have setup in the terminal (macos fault)
    if you start Emacs from inside a terminal, instead of from an icon, that’s different.
    Andrés Moreno
    @andresfib
    let me see what happens if I reinstall the git layer in spacemacs
    Andrés Moreno
    @andresfib
    reinstalling git layer did not help
    M:(getenv "PATH") lists /usr/bin directory, where git is located
    @Blaisorblade starting Emacs from inside the terminal does fix my issue
    Andrés Moreno
    @andresfib
    'PATH' has the same value in both cases though
    Noam Postavsky
    @npostavs
    Could be some other environment variable. You got anything git-relevant in your .bashrc? @andresfib
    Paolo G. Giarrusso
    @Blaisorblade
    Spacemacs lets you snapshot the environment in .spacemacs.env to avoid such issues; maybe that could help?
    Andrés Moreno
    @andresfib
    @npostavs nothing in .bashrc
    my .spacemacs.env is populated with 2 PATH entries, both of them contain /usr/bin/
    Noam Postavsky
    @npostavs
    @andresfib well, in that case you can try comparing the value of process-environment in each case and see if anything sticks out. Maybe the output from M-x magit-debug-git-executable could give a hint too
    Andrés Moreno
    @andresfib
    interesting, M-x magit-debug-git-executable cannot be executed in non-terminal emacs
    Noam Postavsky
    @npostavs
    What do you mean by "cannot"? What happens instead?
    Andrés Moreno
    @andresfib
    in terminal emacs I get /usr/local/bin (t) /usr/local/bin/git (2.19.1) /Users/amoreno/.rvm/gems/ruby-2.4.1/bin (t) /Users/amoreno/.rvm/gems/ruby-2.4.1@global/bin (t) /Users/amoreno/.rvm/rubies/ruby-2.4.1/bin (t) /usr/bin (t) /usr/bin/git (xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun ) /bin (t) /usr/sbin (t) /sbin (t) /usr/texbin (nil) /opt/X11/bin (t) /Users/amoreno/.rvm/bin (t) /Applications/Emacs.app/Contents/MacOS/bin-x86_64-10_10 (t) /Applications/Emacs.app/Contents/MacOS/libexec-x86_64-10_10 (t) /Applications/Emacs.app/Contents/MacOS/libexec (libexec-x86_64-10_5) /Applications/Emacs.app/Contents/MacOS/bin (bin-x86_64-10_5) /Users/amoreno/.nvm/versions/node/v10.1.0/bin (t)
    @npostavs there is [No match] for such command
    Noam Postavsky
    @npostavs
    @andresfib try M-x load-library magit first
    Andrés Moreno
    @andresfib
    we are getting somewhere magit-git-executable: "git" ["/usr/bin/git"] (xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
    Noam Postavsky
    @npostavs
    Looks like your /usr/bin/git is non-functional, and in the terminal case you actually use /usr/local/bin/git
    Paolo G. Giarrusso
    @Blaisorblade
    @andresfib "two PATH entries" is a misconfiguration. Yes, that's what spacemacs generates, but you're supposed to merge them into one entry, using the correct syntax; same for all the other variables.
    In particular, you want /usr/local/bin to come before /usr/bin.
    Also, it sounds like your developer tools are misconfigured, maybe after some reinstall/migration; you might want to fix that (later) if you want to compile (C) software
    (also, agree with what @npostavs said)
    Andrés Moreno
    @andresfib
    I am reinstalling the developer tools, fixing the PATH in .spacemacs.env
    @npostavs yes, you are right. /usr/bin/git is not working in the terminal, /usr/local/bin/git is used
    reinstalling Developer tools fixed /usr/bin/git issue
    Paolo G. Giarrusso
    @Blaisorblade
    Btw, if the broken git returned exit code 1, that’d also be an error reporting bug in magit. No time to report it tho :-(
    Andrés Moreno
    @andresfib
    I can open an issue in github in @Blaisorblade
    Thanks to both @Blaisorblade and @npostavs this was an annoying issue!