From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Sep 2014 19:54:08 +0000 (-0700)
Subject: Merge branch 'jk/prompt-stash-could-be-packed'
X-Git-Tag: v2.2.0-rc0~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64014894cfd29114a6b60cc501f06a68b5f3606b;p=thirdparty%2Fgit.git

Merge branch 'jk/prompt-stash-could-be-packed'

The prompt script checked $GIT_DIR/ref/stash file to see if there
is a stash, which was a no-no.

* jk/prompt-stash-could-be-packed:
  git-prompt: do not look for refs/stash in $GIT_DIR
---

64014894cfd29114a6b60cc501f06a68b5f3606b