Fix detached head state

[cyberious]

No description provided.

[apenney]

oh no!

==> centos-64-x64: Forcing shutdown of VM...
==> centos-64-x64: Destroying VM and associated drives...

Failures:

1. clones a remote repo ensure latest clones a repo
   Failure/Error: apply_manifest(pp, :catch_changes => true)
   Beaker::Host::CommandFailure:
   Host 'centos-64-x64' exited with 4 running:
   env PATH="/usr/bin:/opt/puppet-git-repos/hiera/bin:${PATH}" RUBYLIB="/opt/puppet-git-repos/hiera/lib:/opt/puppet-git-repos/hiera-puppet/lib:${RUBYLIB}" puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest.pp.DcIGaW
   Last 10 lines of output were:
   -a list both remote-tracking and local branches
   -d delete fully merged branch
   -D delete branch (even if not merged)
   -m move/rename a branch and its reflog
   -M move/rename a branch, even if target exists
   -l create the branch's reflog
   -f, --force force creation (when already exists)
   --no-merged print only not merged branches
   --merged print only merged branches
   Notice: Finished catalog run in 0.41 seconds

   ./spec/acceptance/clone_repo_spec.rb:137:in `block (3 levels) in <top (required)>'

Finished in 1 minute 6.93 seconds
51 examples, 1 failure

[sodabrew]

Why not desired here?

[cyberious]

At this point we have already asserted that wear are on a branch. While we can't do a desired on the hard reset than checkout the branch immediately thereafter and then pull to resolve detached head

[sodabrew]

This is a case where using the git "chrome" layer can be trouble, because it changes over time (and has changed a lot across git versions on supported OS revisions). I would advise against using git branch in this way, if it's at all possible to use rev-parse and other "low level" git commands instead.

[sodabrew]

How about:

git rev-parse --symbolic-full-name --abbrev-ref HEAD

on a branch, returns brachname and detached, returns HEAD. Let's see if that works all the way back to git 1.5... ?

[cyberious]

previously we were just seaing if we had git rev-parse --abbrev-ref HEAD but if we are using branches that is not the desired state. We want the latest for that branch that we have decided to call revision.

[cyberious]

Exited: 1
should not be directory
removing temporory ssh-config files per-vagrant box
Destroying vagrant boxes
WARNING: Could not load IOV methods. Check your GSSAPI C library for an update
WARNING: Could not load AEAD methods. Check your GSSAPI C library for an update
WARNING: Nokogiri was built against LibXML version 2.8.0, but has dynamically loaded 2.9.1
==> centos-64-x64: Forcing shutdown of VM...
==> centos-64-x64: Destroying VM and associated drives...

Finished in 1 minute 5.41 seconds
51 examples, 0 failures

[apenney]

I'm OK with this but I'm also a git idiot. It looks to me like it's doing the right thing, @sodabrew, did the change to -a help at all with your concerns?

[sodabrew]

git branch -a will return many lines with every available local and remote branch. If the current head is detached, there will be a line like this:

$ git branch -a | grep \*
* (detached from 3896638)

If the current head is on a branch, there will be a line like this:

$ git branch -a | grep \*
* master

I think it's fine actually, but the test data should be messier to make sure that the regex handles multilines correctly. I would warn that this is using the git "chrome" and the output is designed for human consumption rather than machine parsing and can change over time.

[cyberious]

Added multiline branch -a

[sodabrew]

👍