threads / bug / 28592

[BUG] git stash -k show the help message for diff-index

Subject: [BUG] git stash -k show the help message for diff-index

## tl;dr

3 messages between Oct 5, 2011 and Oct 6, 2011.

replies: 2people: 2as markdown or json

Matthieu Moy· Oct 5, 2011, 15:13 UTC · lore
Everything is in the title. No time to bisect/fix this now, but:
$ git status
# On branch master
nothing to commit (working directory clean)
$ git stash -k
usage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
common diff options:
  -z            output diff-raw with lines terminated with NUL.
  -p            output patch format.
  -u            synonym for -p.
  --patch-with-raw
                output both a patch and the diff-raw format.
  --stat        show diffstat instead of patch.
  --numstat     show numeric diffstat instead of patch.
  --patch-with-stat
                output a patch and prepend its diffstat.
  --name-only   show only names of changed files.
  --name-status show names and status of changed files.
  --full-index  show full object name on index lines.
  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.
  -R            swap input file pairs.
  -B            detect complete rewrites.
  -M            detect renames.
  -C            detect copies.
  --find-copies-harder
                try unchanged files as candidate for copy detection.
  -l<n>         limit rename attempts up to <n> paths.
  -O<file>      reorder diffs according to the <file>.
  -S<string>    find filepair whose only one side contains the string.
  --pickaxe-all
                show all files diff when -S is used and hit is found.
  -a  --text    treat all files as text.
usage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
common diff options:
  -z            output diff-raw with lines terminated with NUL.
  -p            output patch format.
  -u            synonym for -p.
  --patch-with-raw
                output both a patch and the diff-raw format.
  --stat        show diffstat instead of patch.
  --numstat     show numeric diffstat instead of patch.
  --patch-with-stat
                output a patch and prepend its diffstat.
  --name-only   show only names of changed files.
  --name-status show names and status of changed files.
  --full-index  show full object name on index lines.
  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.
  -R            swap input file pairs.
  -B            detect complete rewrites.
  -M            detect renames.
  -C            detect copies.
  --find-copies-harder
                try unchanged files as candidate for copy detection.
  -l<n>         limit rename attempts up to <n> paths.
  -O<file>      reorder diffs according to the <file>.
  -S<string>    find filepair whose only one side contains the string.
  --pickaxe-all
                show all files diff when -S is used and hit is found.
  -a  --text    treat all files as text.

Saved working directory and index state WIP on master: 977c790 foo HEAD is now at 977c790 foo

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Junio C Hamano· Oct 5, 2011, 17:43 UTC · re: Matthieu Moy · lore

Re: [BUG] git stash -k show the help message for diff-index

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 7 quoted lines
> Everything is in the title. No time to bisect/fix this now, but:
>
> $ git status
> # On branch master
> nothing to commit (working directory clean)
> $ git stash -k
> usage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
Hmm, does not reproduce.

: alter victim-2.git/master; git status # On branch master nothing to commit (working directory clean) : alter victim-2.git/master; git stash -k No local changes to save : alter victim-2.git/master; git version git version 1.7.7

Matthieu Moy· Oct 6, 2011, 09:54 UTC · re: Junio C Hamano · lore

Re: [BUG] git stash -k show the help message for diff-index

Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Hmm, does not reproduce.
>
> : alter victim-2.git/master; git status
> # On branch master
> nothing to commit (working directory clean)
> : alter victim-2.git/master; git stash -k
> No local changes to save
> : alter victim-2.git/master; git version
> git version 1.7.7
Sorry, I should have mentionned that: I had the bug with next.

I've tried bisecting it down, but the bug mysteriously disappeared during the bisect (I did have bad and good commits during bisect, but at the end, I had only good commits, and the bad ones weren't reproducible).

I can't reproduce anymore.
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

← back to recent threads