diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-13 17:43:08 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-13 17:43:08 +0000 |
| commit | 35f9111d9497160c44a5e4fa2b8a1964e68d0fd5 (patch) | |
| tree | f908f10baf4ef22a2fe1b85411399ebc07848dbe /tests.branching | |
| parent | 2723ce3a8fa56ddec0c003e23bc037fade2ceb23 (diff) | |
| parent | bec9ecbbb7ab988488c77ea1fe995164ec0c073f (diff) | |
| download | morph-35f9111d9497160c44a5e4fa2b8a1964e68d0fd5.tar.gz | |
Merge remote-tracking branch 'remotes/origin/samthursfield/ambiguous-refs' into baserock/merge-queue
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/ambiguous-refs.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index a93c4b66..0ea8a55f 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -16,8 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -## 'git show-ref master' sorts its output alphabetically, so we can't rely on -## it to resolve 'master': we might get 'alpha/master' instead. +## Guard against a bug that occurs if 'git show-ref' is used to resolve refs +## instead of 'git rev-parse --verify': show-ref returns a list of partial +## matches sorted alphabetically, so any code using it may resolve refs +## incorrectly. set -eu |