magit/magit

It's Magit! An Emacs mode for Git.

Compro Prasad

@Compro-Prasad

Can you see what is the problem here: https://github.com/Compro-Prasad/emacs-config/blob/master/init.el#L78

duianto

@duianto

I don't know if any of those settings are related. But I suspect not, because I don't have any of them.

Compro Prasad

@Compro-Prasad

@duianto You say you can reproduce it. Do you mean to say that you can reproduce the error?

duianto

@duianto

Both the error when setting the variable before opening a magit-status buffer. And the indentation highlighting changing when evaluating the variable and refreshing the magit-status buffer.

I just created a new .emacs.d and installed magit, and the same thing happens.

Compro Prasad

@Compro-Prasad

So, you are saying that (setq magit-diff-highlight-indentation 3) workaround also produces an error for you?

That doesn't work in my own config but does work in a fresh install

duianto

@duianto

ok, now I understand :+1: I thought that you meant by:

It worked on a fresh Emacs instance.

That it also fixed setting the variable before opening magit.

duianto

@duianto

Setting the variable before opening magit-status isn't limited to setting ~/.emacs.d as the car, it also happens with:

(setq magit-diff-highlight-indentation '("c:/testrepo" . tabs))

magit-diff-paint-hunk: Wrong type argument: listp, ("c:/testrepo")

That seems to be the issue, we don't know what to put as the car. It would be helpful if the docstring showed an example of how it's supposed to be used.

Compro Prasad

@Compro-Prasad

I think this should go in the Magit issues page

duianto

@duianto

I was going to write an issue about it and the support template seemed like the right choice for asking how to use the variable. But the support template said that the issues tracker isn't for support requests and suggested posting it on stack exchange or reddit, so I posted it here.

Jonas Bernoulli

@tarsius

The doc-string already describes the expected format (though in terms you might not be familiar with) and if you use the Custom interface then you are guided in getting the format right. (setq magit-diff-highlight-indentation '(("c:/testrepo" . tabs)))

Jonas Bernoulli

@tarsius

I have improved the documentation.

duianto

@duianto

Confirmed, that works. I hadn't used customize enough to discover that it does the right thing and lets us just enter the desired values. Thanks

It doesn't seem to work with ~/.emacs.d but it works with the full path c:/users/username/.emacs.d. It's probably a Windows issue with ~ (tilde). Because cd ~ in Windows Powershell navigates to the home dir. But in the Command Prompt it just says that it can't find the path specified. So it's not a Magit or Emacs issue.

Thanks for the docstring clarification, I'm sure others will find it useful. :+1:

Jonas Bernoulli

@tarsius

That's because the regular expression ~/ does not match the string C:/users/username/.

duianto

@duianto

:+1:

FungusHumungus

@FungusHumungus

Hi, is there any way to change the date format in magit-log?

I'm looking for a particular commit from 26 June and the date of all the commits just says "2 months" which makes it quite hard to find the particular commit in question..

Noam Postavsky

@npostavs

@FungusHumungus M-x apropos-variable magit margin RET

FungusHumungus

@FungusHumungus

Beatiful, this does it :

(setf (nth 1 magit-log-margin) "%Y-%m-%d %H:%M")

Many thanks.

Brandon Verkamp

@JadElClemens

Whattup fellas

I'm running into a weird issue applying a release tag with one specific repo of mine. I'm getting (wrong-type-argument stringp nil) - I can't tell exactly where the nil is getting passed up but the most recent call in the stack is replace-match(nil t t "v3.2.2")

'v3.2.2' being the most recent tag applied in the repo

Brandon Verkamp

@JadElClemens

This only happens with release tags, regular tags apply just fine

Jonathon McKitrick

@jmckitrick

I think I found a small bug in the latest magit, specifically around fetching all remotes:

funcall-interactively: Symbol’s value as variable is void: remote

There was a commit made a few hours ago around this function: magit-fetch-all

I'm going to try to figure out the issue, but my initial naive fixes have been incorrect so far.

Noam Postavsky

@npostavs

@jmckitrick you mean this one: magit/magit@904bb82? I think probably replace remote with nil is the right thing

Kevin Foley

@kevinjfoley

I'd like to display a section on the status page with the files that have changed between head and upstream, is there an existing magit-insert function that could handle this?

Kevin Brubeck Unhammer

@unhammer

Is there something like merge into m i that will fast-forward master to feature without checking out master first?

Noam Postavsky

@npostavs

@unhammer you can use b x to move a non-checked-out branch, but it's not a merge, so you have to look manually if it's what you want first. Maybe it's worth making a command that does that.

Kevin Brubeck Unhammer

@unhammer

hm, b x seems close to what I want, but a bit scary

Duncan MacGregor

@aardvark179

Is there a way in forge to mark multiple topics as read?

James Elliott

@brunchboy

I never can figure this out from the manual. Magit has stopped highlighting white space diffs, how do I re-enable that?

duianto

@duianto

@brunchboy It might be related to this issue:
Magit diff fontification clashes with whitespace-mode #3950

James Elliott

@brunchboy

Hmm, maybe… I’m not up to date enough with emacs internals in GUI environments (I last really looked at internals in the 1980s when I was on dialup text terminals) to understand the details. I will see if it clears up.

DieracDelta

@DieracDelta

how can I get a diff between two commits using magit?

like, say the equivalent of git diff HEAD~1 HEAD

DieracDelta

@DieracDelta

nvm it's dr to get an offset from head

Daniel Martín

@danielmartin

I have a merge where a lot of staged changes are "unmerged" (deleted by us). I can select groups of them and press k to choose how to resolve the conflicts. Is there a smarter way, maybe filtering the magit status buffer to only show me "unmerged" changes so that I can select them all at once?

Truls Asheim

@truls

Is it possible to enable line wrapping in the magit diff view?

duianto

@duianto

@truls M-x toggle-truncate-lines seems to toggle line wrapping for me.

sidnt

@sidnt

Is it categorically true that if we were to trace back every branch in a git repository, we would always end up at the first commit of the repo?

Noam Postavsky

@npostavs

@sidnt no, git allows "orphan branches"

sidnt

@sidnt

:thumbsup:

Magnus Therning

@magthe

And git does support multiple "first commits". You can even have two separate trees in a git repo if you want.

Where communities thrive

People

Repo info

Activity