]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 442136f eff4511)
Merge branch 'ld/p4-current-branch-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:23 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:23 +0000 (21:37 -0700)
commitc2cbb30fc075d9bf926a739d05712b4debae4b97
tree8a4d90d48391100c0ef9dfd30a6cc9c4e409d964tree | snapshot
parent442136f742b18872b292cc37ae4809d746791043commit | diff
parenteff451101dcdc6fe023861c6c02a9bacc43f372ecommit | diff
Merge branch 'ld/p4-current-branch-fix'

"git p4" used "name-rev HEAD" when it wants to learn what branch is
checked out; it should use "symbolic-ref HEAD".

* ld/p4-current-branch-fix:
  git-p4: don't use name-rev to get current branch
  git-p4: add read_pipe_text() internal function
  git-p4: add failing test for name-rev rather than symbolic-ref
Unnamed repository; edit this file 'description' to name the repository.