projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: caadf4f eff4511)
Merge branch 'ld/p4-current-branch-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Apr 2017 05:36:35 +0000 (22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Apr 2017 05:36:35 +0000 (22:36 -0700)
commit9e74a2609e5a16c9c15a1a96d24fc397bb17da42
tree2dd8375369eda45263ce54d78bba6e8bd999e767tree | snapshot
parentcaadf4ff6654a14f44bbab7fb45d9074564e14fecommit | diff
parenteff451101dcdc6fe023861c6c02a9bacc43f372ecommit | diff
Merge branch 'ld/p4-current-branch-fix' into next

"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.