New merge command #27

lukasgierth · 2020-12-16T16:01:30Z

Hi,

i added a simple merge command which simply calls "git merge $argv".
I use git merge quite often and was frustrated that i always have to use "git merge" instead of just "merge".

This first entry right now is only like an alias basically. But the plan is that the functionality can be expanded later on (dry runs etc.). I did not come up with a keyboard shortcut (that makes sense) yet.

Greetings from Germany,
stay healthy everyone!

joseluisq · 2020-12-16T21:36:00Z

Hi, that's no bad idea to have the ease of typing during a merge via Fish auto completion.
However I would like to see some usage examples of that command (with no arguments and with them).

joseluisq

Also I would like to see some updates on the README for this new command with some examples.

joseluisq · 2020-12-16T21:43:17Z

conf.d/gitnow.fish

+    end
+
+    set -l len (count $argv)
+    set -l opts .


Since the default argument looks like is a dot, a simple merge (git merge .) execution throws an error like fatal: . - not something we can merge.
If some argument is needed, I suggest to add some checks.

lukasgierth · 2020-12-17T08:35:55Z

I added some checks (does the branch exist, is it not the already active one etc.). I also added the -a option (instead of the branch name) to abort a conflicted branch.
Right now it only checks if zero arguments are given. Should we better check that exactly one is give (so either a branch or the -a option)?
I also updated the README.

Some examples:
❯ merge sss
Local branch sss was not found. Not possible to merge.

❯ merge
Merge: No argument given, needs one parameter

❯ merge master
Branch master is the same as current branch. Nothing to do,

joseluisq · 2020-12-17T09:24:17Z

Right now it only checks if zero arguments are given. Should we better check that exactly one is give (so either a branch or the -a option)?

It's good idea since you need at least one arg.
However It will be even better if you make a distinguish between arguments like option flags (with dashes) and just branch names.
As a hint you can check the switch statement on tag command which is relative easy to implement.

lukasgierth · 2020-12-17T09:51:08Z

If you look at my last commit, I already do use switch like you suggested

joseluisq · 2020-12-17T09:53:50Z

Yes, you already do it. Sorry I had not seen it.

BTW Check this bugfix for #28 which prevent an issue with the __gitnow_check_if_branch_exist.

joseluisq · 2020-12-17T10:06:01Z

I plan to merge this in few minutes after a last review.

track changes from original repository

joseluisq · 2020-12-17T10:36:33Z

When I try the merge command with option arguments (flags) then I get this:

merge --continue
# Local branch `` was not found. Not possible to merge.

I think you need to iterate over the $argv in order to know if you got a branch name param with options or without them.
The way to do it is implemented on move command.

gitnow/conf.d/gitnow.fish

Lines 256 to 281 in 708a95a

    
           set -l v_branch 
        
           for v in $argv 
        
               switch $v 
        
                   case -u --upstream 
        
                       set v_upstream $v 
        
                   case -n --no-apply-stash 
        
                       set v_no_apply_stash $v 
        
                   case -nu -un 
        
                       set v_upstream "-u" 
        
                       set v_no_apply_stash "-n" 
        
                   case -h --help 
        
                       echo "NAME" 
        
                       echo "      Gitnow: move - Switch from current branch to another but stashing uncommitted changes" 
        
                       echo "EXAMPLES" 
        
                       echo "      move <branch to switch to>" 
        
                       echo "OPTIONS:" 
        
                       echo "      -n --no-apply-stash     Switch to a local branch but without applying current stash" 
        
                       echo "      -u --upstream           Fetch a remote branch and switch to it applying current stash. It can be combined with --no-apply-stash" 
        
                       echo "      -h --help               Show information about the options for this command" 
        
                       return 
        
                   case -\* 
        
                   case '*' 
        
                       set v_branch $v 
        
               end 
        
           end

Which means you will need another check when a branch is not provided.

gitnow/conf.d/gitnow.fish

Lines 283 to 289 in 708a95a

    
           # No branch defined 
        
           if not test -n "$v_branch" 
        
               echo "Provide a valid branch name to switch to." 
        
               commandline -f repaint 
        
               return 
        
           end

lukasgierth · 2020-12-17T13:13:53Z

Pushed a new commit which should satisfy your suggestions.

joseluisq · 2020-12-17T14:06:26Z

I have tested and works fine!

~> merge --continue
Continue the current merge
fatal: There is no merge in progress (MERGE_HEAD missing).
~> merge
Merge: No argument given, needs one parameter
~> merge -a
Abort the current merge
fatal: There is no merge to abort (MERGE_HEAD missing).
~> git merge --help
~> merge --continue --no-verify
Continue the current merge
fatal: There is no merge in progress (MERGE_HEAD missing).
~> merge --no-verify --continue
Continue the current merge
fatal: There is no merge in progress (MERGE_HEAD missing).
~> merge --no-verify
Provide a valid branch name to switch to

joseluisq

There is the last remaining change that should happen in order to merge this PR.

conf.d/gitnow.fish

joseluisq

Thanks!

lukasgierth added 2 commits December 16, 2020 16:46

add rudimantary merge command with simple branch completion

f339f07

add manual entry (without keyboard shortcut)

11a566b

joseluisq self-assigned this Dec 16, 2020

joseluisq added the enhancement New feature or request label Dec 16, 2020

joseluisq reviewed Dec 16, 2020

View reviewed changes

do some checks, add abort option to merge, update README

479fb99

joseluisq mentioned this pull request Dec 17, 2020

Fix invalid argument error when __gitnow_check_if_branch_exist is used for Fish test checks #28

Merged

lukasgierth added 2 commits December 17, 2020 11:06

Merge pull request #1 from joseluisq/master

8fa788e

track changes from original repository

fix naming, merge not move

6cebf85

add continue as option, capture unsupported --options

979582b

joseluisq changed the title ~~Simple merge command~~ New merge command Dec 17, 2020

joseluisq reviewed Dec 18, 2020

View reviewed changes

conf.d/gitnow.fish Outdated Show resolved Hide resolved

fix echo message

7f849f3

joseluisq approved these changes Dec 18, 2020

View reviewed changes

joseluisq merged commit 10e064c into joseluisq:master Dec 18, 2020

joseluisq added this to the 2.6.0 milestone Dec 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

New merge command #27

New merge command #27

Uh oh!

lukasgierth commented Dec 16, 2020

Uh oh!

joseluisq commented Dec 16, 2020

Uh oh!

joseluisq left a comment

Uh oh!

joseluisq Dec 16, 2020

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq left a comment

Uh oh!

Uh oh!

joseluisq left a comment

Uh oh!

Uh oh!

Uh oh!

New merge command #27

New merge command #27

Uh oh!

Conversation

lukasgierth commented Dec 16, 2020

Uh oh!

joseluisq commented Dec 16, 2020

Uh oh!

joseluisq left a comment

Choose a reason for hiding this comment

Uh oh!

joseluisq Dec 16, 2020

Choose a reason for hiding this comment

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

lukasgierth commented Dec 17, 2020

Uh oh!

joseluisq commented Dec 17, 2020

Uh oh!

joseluisq left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

joseluisq left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!