Gitjk – command to undo what you just did in git

by mapmeld • 12 years ago

83 31 12 years ago

svckr• 12 years ago

Isn't that what git reflog + reset are for?

tetha2• 12 years ago

Why is sudo hardcoded into so many commands? I'll run your program with privileges if it needs and earned them, thank you very much.

mapmeld3• 12 years ago

It will print (not run) the command unless you type 'gitjk -f'

When I run 'rm -r' on my machine it warns me about every file in the .git directory.

eertami• 12 years ago

rm -rf?

coherentpony2• 12 years ago

`sudo` is not the best practice with regard to removing that warning, try the `-f` flag instead.

lazzlazzlazz• 12 years ago

sudo hard-coded, and an intolerably stupid name. Next.

develop72• 12 years ago

well it could be named git-unfuck (1)

homulilly2• 12 years ago

Except going by the examples it actually just makes things worse by providing bad advice.

homulilly2• 12 years ago

Uh... if you want to undo a git add shouldn't you be doing git reset?

mapmeld3• 12 years ago

somehow when I was testing it, I thought I needed to use rm -r --cached to remove a previously untracked file. It should do git reset in most cases.

Edit: now recommends git reset unless you did "git add ." or something like that.

achal• 12 years ago

You may have been on your initial commit; in that case, you need to use rm --cached instead of reset to undo a git add.

develop72• 12 years ago

It does rely on history? Well, it won't work for me then — in my history there's only frequently-used commands.

bilalq• 12 years ago

It's kind of nice that this just gives suggestions by default rather than running potentially breaking commands.

But as someone else here mentioned, you really want to understand the reflog in git. Everyone screws up at some point or another, and it's much easier to work through things when you can rely on the reflog to act as a safety net and an anchor of sanity.

jamesgeck0• 12 years ago

I occasionally wish git had an undo-whatever-I-just-did command, and I've been using it for years.

The git fixup page comes in quite handy. https://sethrobertson.github.io/GitFixUm/fixup.html

_kst_• 12 years ago

If you name it "git-jk" rather than "gitjk", you can invoke it as

  git jk

couchand• 12 years ago

Is that specific to git or is it in the shell?

taejo• 12 years ago

It is specific to git.

pyre• 12 years ago

All of the:

  git <command>

commands are executables of the form 'git-<command>' in specific directory:

  $ git --exec-path
  /usr/local/Cellar/git/1.9.0/libexec/git-core 

  $ ls $(git --exec-path) | head
  git
  git-add
  git-add--interactive
  git-am
  git-annotate
  git-apply
  git-archimport
  git-archive
  git-bisect
  git-bisect--helper

In git's earlier years, it was just a set of git-<command> commands in $PATH, until the master git command was created (to 'rule them all' if you will).

git will actually pick up anything in $PATH of the form 'git-<command>' and allow you to run it as 'git <command>'. The downside of this, is that commands of the form:

  git <command> --help

are intercepted by git and converted to:

  man git-<command>

So your command cannot process the --help option itself when called like this (or it used to be this way a couple of years ago).

Edit: Another downside, is that some 'smart' command-line completion settings either have a hard-coded list of 'git <command>' commands, or look for said commands in the value returned by 'git --exec-path'. So you can't tab-complete git-<command> commands that you just drop into $PATH (at least not out of the box).

kolev• 12 years ago

Git.

bodyfour• 12 years ago

The gitjk command needs to operate as a shell alias though

lunixbochs• 12 years ago

If anyone wants a fish function:

    function jk
        history | head -n+10 | tail -r | gitjk_cmd
    end

Maybe git full undo via automatic snapshotting (branch/stash)? It's fine unless you hit a perf wall on huge repos.

prezjordan• 12 years ago

The git reflog gets you out of all kinds of messes. https://medium.com/git-tips/a4189dd88c40

burke• 12 years ago

rebase isn't very hard to implement; you just have to check the reflog.

thrush• 12 years ago

Does it work if you call it 2x or more?

tjdetwiler• 12 years ago

I'm pretty sure your fetch logic is not right. First it assumes no arguments are passed. You assume origin/master (which is convention but not guaranteed) and also you assume a refspec isn't passed (in which case you need to rollback FETCH_HEAD).

junkblocker• 12 years ago

Gitjk – command to undo what you just did in git

Related Stories