Stash changes before running pre-commit #12

Activity

1. finnhodgkin

   added

   enhancement

   on Oct 12, 2017
2. bb4242

   added 2 commits that reference this issue on Jun 4, 2018

   Stash working directory before running hooks

   ...

   3d13465

   Stash working directory before running hooks

   ...

   cdef380
3. DenisGorbachev commented on Jun 9, 2018

   

   DenisGorbachev

   on Jun 9, 2018

   More actions

   Doesn't work with git version 1.9.1: stash command doesn't have push subcommand.

   starfall@nx:~/workspace/leverex$ git commit
   Pre-commit running...
   usage: git stash list [<options>]
      or: git stash show [<stash>]
      or: git stash drop [-q|--quiet] [<stash>]
      or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
      or: git stash branch <branchname> [<stash>]
      or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
   		       [-u|--include-untracked] [-a|--all] [<message>]]
      or: git stash clear
   ** (MatchError) no match of right hand side value: {"", 1}
       lib/mix/tasks/pre_commit.ex:18: Mix.Tasks.PreCommit.run/1
       (mix) lib/mix/task.ex:314: Mix.Task.run_task/3
       (mix) lib/mix/cli.ex:80: Mix.CLI.run_task/2
       (elixir) lib/code.ex:677: Code.require_file/2
   starfall@nx:~/workspace/leverex$ git --version
   git version 1.9.1
   
4. jdav-dev commented on Jul 18, 2018

   

   jdav-dev

   on Jul 18, 2018

   More actions

   Using git stash push --keep-index as in #30 restores deleted files to the working tree:

   $ git init
   Initialized empty Git repository in /tmp/git-stash-test/.git/
   $ touch test
   $ git add -A
   $ git commit -m 'initial commit'
   [master (root-commit) 5e0577e] initial commit
    1 file changed, 0 insertions(+), 0 deletions(-)
    create mode 100644 test
   $ rm test
   $ git add -A
   $ git status
   On branch master
   Changes to be committed:
     (use "git reset HEAD <file>..." to unstage)
   
           deleted:    test
   
   $ git stash push --keep-index --message pre_commit
   Saved working directory and index state On master: pre_commit
   $ git stash pop
   On branch master
   Changes to be committed:
     (use "git reset HEAD <file>..." to unstage)
   
           deleted:    test
   
   Untracked files:
     (use "git add <file>..." to include in what will be committed)
   
           test
   
   Dropped refs/stash@{0} (b6658734f4ae35a43bcff3f43b306ea6ae238902)
   
5. ZooeyMiller commented on Jul 19, 2018

   

   ZooeyMiller

   on Jul 19, 2018

   Last edited by ZooeyMiller

   Collaborator

   More actions

   Can we close this issue now that #30 is merged? @finnhodgkin
6. jdav-dev commented on Jul 19, 2018

   

   jdav-dev

   on Jul 19, 2018

   More actions

   I've opened #32 with my comment so it can be tracked on its own.

   👍React with 👍2Reacted by Zooey Miller and Ines Teles Correia
7. iteles commented on Jul 20, 2018

   

   iteles

   on Jul 20, 2018

   Member

   More actions

   @ZooeyMiller I'm with @finnhodgkin now and will nudge 😊

   👍React with 👍1Reacted by Zooey Miller
8. iteles

   assigned

   finnhodgkin

   on Jul 20, 2018
9. iteles

   added

   please-test

   on Jul 20, 2018
10. finnhodgkin

    closed this as completedon Jul 20, 2018
11. secondspass commented on Jul 26, 2018

    

    secondspass

    on Jul 26, 2018

    More actions

    Hey, just wanted to let you know that git stash push does not exist in git versions older than 2.13. git stash save exists which covers the same ground (but it doesn't have the --message flag).

    So if you want it to be backwards compatible, you might want to take another look at it. (Or if you're intending this only for newer versions, disregard this comment).
12. ZooeyMiller commented on Jul 27, 2018

    

    ZooeyMiller

    on Jul 27, 2018

    Collaborator

    More actions

    @secondspass Thanks for letting us know! I'll add required git version to the docs as well.