Forem: Zanets

How to find the commits from last pull

Zanets — Sun, 07 Jun 2020 02:26:07 +0000

I came out with this question recently: how to find those commits from last git pull?

Of course you can check git log first, record the last commit and check again after git pull.

Obviously not an ideal approach for a lazy developer like me.

Here is an example.

As you can see, this local repository is on ed102ca, but remote is on 7b44e48.
So, how do I find those commits from 3dea674 to 7b44e48 after git pull ?

git reflog + git show

What is reflog ?

Well, it's a log which records the modified when HEAD is changed. Such as git rebase, git commit and git pull will change the HEAD.

After you did a git pull, your last reflog will like this.



7b44e48 HEAD@{0}: pull: Fast-forward
952bd4d HEAD@{1}: ...

We can use git show to see the difference between HEAD@{1} and HEAD@{0}.



git show @@{1}..@@{0}

The @@{n} is an alias of HEAD@{n}, so this command shows the diff between HEAD@{1} and HEAD@{0} which contains commits from 3dea674 to 7b44e48.

git show shows commit message and file diff in pager by default, use this command instead when you just want an overview list.



git -c pager.show=false show --format="%h %an %s" -q @@{1}..@@{0}

This command shows commit hash, author and subject, without diff result and doesn't use pager.



$ git -c pager.show=false show --format="%h %an %s" -q @@{1}..@@{0}
7b44e48 Zanets [refactor][git] don't need bash
f322bee Zanets [feat][vim/fzf] enhance color
c30740f Zanets [feat][bash] ls colors
4985b83 Zanets [feat][bash] get support multiple url
952bd4d Zanets [feat][tmux] better output color
7239d0f Zanets [feat][vim] enhance Help
650ed49 Zanets [refactor][vim] use a/b/c/d
1e092fd Zanets [refactor][vim] move comment to backup
3dea674 Zanets [config][vim] use origin fzf.vim
$

Which is exactly what I want.

Sometimes @@{1}..@@{0} shows nothing, it's usually because of rebase



7b44e48 HEAD@{0}: rebase finished: returning to refs/heads/master
7b44e48 HEAD@{1}: pull: checkout 7b44e48646057a89e8f90ff6953b2c696d06eeda
ed102ca HEAD@{2}: ...

If this happen, use @@{2}..@@{0} instead.

Custom git command

Zanets — Sat, 06 Jun 2020 17:28:26 +0000

There is an 'alias' section in gitconfig to create custom command.

[alias]
    ck = checkout

You can type git ck instead of git checkout.

But the most powerful of alias is it also accept shell script.

test = "! echo git-test"

Now we can have a lot of fun.
You can just write a tiny script in gitconfig like this

test = "! \
    f() { \
        echo git-test-start; \
        echo $1; \
        echo git-test-end; \
    }; f"

Bascally I create a function and call it immediatly. Wrap in a function so that we can use $@, $1... to access arguments.

But since alias needs to be a single line, you need ; \ at each end of line. It's fine for simple script but painful for complex one. So I came out with another approach

test = "! ~/bin/git.sh do_test"

And create ~/bin/git.sh

#!/usr/bin/env bash

do_test() {
    echo git-test-start
    echo $1
    echo git-test-end
}

"$@"

Then don't forget chmod +x ~/bin/git.sh.

That's it. It's very useful for those complex and hard to remember tricks of git.

Fancy fzf on neovim

Zanets — Sat, 06 Jun 2020 16:29:27 +0000

After neovim 4.0 and vim 8.1, both of them have an amazing feature: popup window.
That's take a look how it makes fzf better.

This is how fzf looks in terminal buffer.

This is how fzf looks in popup window.

There are two reason why I prefer popup window.

The position of cursor doesn't move.
Looks more like a "menu".

Configure fzf to use popup window

Thanks to the author of fzf, fzf has supported the popup window.

let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.5, 'highlight': 'Comment' } }

When the window entry is a dictionary, fzf will treat the value as the attribute of popup window. Here are some attributes you can set

Required

width: float range [0 ~ 1]
height: float range [0 ~ 1]

Optional

yoffset: float default 0.5 range [0 ~ 1]
xoffset: float default 0.5 range [0 ~ 1]
highlight: [string]: Highlight group for border
border: [string default rounded]: Border style

Avaliable Border Style: rounded: / sharp / horizontal / vertical / top / bottom / left / right

Customize the colors

If you have set colors in FZF_DEFAULT_OPTS, then you don't have to worry this. If not, you can set in shell or neovim.

You can find those elements which can be customized here: https://github.com/junegunn/fzf/blob/a9fba1c8496f7352de55b9fe5f36f23872e5a364/README-VIM.md#L140

shell

export FZF_DEFAULT_OPTS='
    --color fg:14,fg+:3,hl:5,hl+:5,bg:-1,bg+:-1
    --color info:6,prompt:6,spinner:1,pointer:3
'

Well, yes, pass two '--color' to fzf is legal.

neovim
It's a little harder than in shell. You need to set g:fzf_colors

let g:fzf_colors =
  \ { 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'] }

Uh...what are them ?

For example

'bg+':     ['bg', 'CursorLine', 'CursorColumn']

The logic is

FZF will color 'bg+' with the 'bg' of highlight group 'CursorLine'.
If 'CursorLine' doesn't have 'bg', then find in 'CursorColumn' and so on.
If none of them have 'bg', use default value.

If you don't like to use an unrelated highlight group like me, you can create new ones for fzf.

hi! fzf_fg ctermfg=14                                                                                                                                                       
hi! fzf_fgp ctermfg=3                                                                                                                                                       
hi! fzf_hl ctermfg=5                                                                                                                                                        
hi! fzf_hlp ctermfg=5                                                                                                                                                       
hi! fzf_info ctermfg=6                                                                                                                                                      
hi! fzf_prompt ctermfg=6                                                                                                                                                    
hi! fzf_spinner ctermfg=6                                                                                                                                                   
hi! fzf_pointer ctermfg=3

let g:fzf_colors = {                                                                                                                                                        
  \ 'fg':      ['fg', 'fzf_fg'],                                                                                                                                            
  \ 'hl':      ['fg', 'fzf_hl'],                                                                                                                                            
  \ 'fg+':     ['fg', 'fzf_fgp'],                                                                                                                                           
  \ 'hl+':     ['fg', 'fzf_hlp'],                                                                                                                                           
  \ 'info':    ['fg', 'fzf_info'],                                                                                                                                          
  \ 'prompt':  ['fg', 'fzf_prompt'],                                                                                                                                        
  \ 'pointer': ['fg', 'fzf_pointer'],                                                                                                                                       
  \ 'spinner': ['fg', 'fzf_spinner'] }

By the way, you can also do this to the highlight attribute of g:fzf_layout.

FZF will generate the color setting from g:fzf_colors. To check the generated result, use this vim command

:echo fzf#wrap()

If enerything is good, fzf will trans g:fzf_colors to the format of FZF_DEFAULT_OPTS

{'options': '''--color=info:6,spinner:6,hl:5,fg:14,fg+:3,pointer:3,prompt:6,hl+:5''  --expect=ctrl-v,ctrl-x,ctrl-t', 'sink*': func
tion('283'), 'window': {'highlight': 'fzf_popup', 'width': 0.8, 'height': 0.5}, '_action': {'ctrl-v': 'vsplit', 'ctrl-x': 'split',
 'ctrl-t': 'tab split'}}

Well, how do I know the color number ?

If you use 256 color, you can reference this cheat sheet: https://jonasjacek.github.io/colors/

Or this tiny script

for i in {0..255}; do
    printf "\x1b[38;5;${i}m%-9s\x1b[0m" "colour${i}"
    if (( $i % 5 == 0 )); then                            
        printf "\n"                                   
    else                                                  
        printf " "                                    
    fi                                                    
done

Reference

https://github.com/junegunn/fzf/blob/a9fba1c8496f7352de55b9fe5f36f23872e5a364/README-VIM.md#L140
https://jonasjacek.github.io/colors/