Uwe Kleine-König <ukleinek@xxxxxxxxxxxxxxxxxxxxxxxxxx> writes: > zeisberg@cassiopeia:/tmp$ mkdir repo; cd repo; git init > Initialized empty Git repository in .git/ > > zeisberg@cassiopeia:/tmp/repo$ mkdir dir; echo one > file; echo two > dir/file > > zeisberg@cassiopeia:/tmp/repo$ git add file dir/file > > zeisberg@cassiopeia:/tmp/repo$ git commit -m tralala > Created initial commit 265b7d7: tralala > 2 files changed, 2 insertions(+), 0 deletions(-) > create mode 100644 dir/file > create mode 100644 file > > zeisberg@cassiopeia:/tmp/repo$ echo three >> file > > zeisberg@cassiopeia:/tmp/repo$ git stash > Saved "WIP on master: 265b7d7... tralala" > HEAD is now at 265b7d7... tralala > > zeisberg@cassiopeia:/tmp/repo$ cd dir; git stash apply > error: missing object referenced by '696146c2a44d7fc4d5ae4a71589c4c0d84f59789' > /home/zeisberg/usr/bin/git-stash: line 111: 13618 Segmentation fault git-merge-recursive $b_tree -- $c_tree $w_tree This probably is a merge-recursive bug, but in the meantime, I think this should fix it. --- git-stash.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index de13dd1..d9cd42d 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -6,6 +6,7 @@ USAGE='[ | list | show | apply | clear]' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +cd_to_toplevel TMP="$GIT_DIR/.git-stash.$$" trap 'rm -f "$TMP-*"' 0 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
