diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-10-04 13:47:39 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-10-04 13:47:39 -0700 |
| commit | 7ecba715c4b19b2ab1f181b2b1bad256b2cdf512 (patch) | |
| tree | 4b9cc3afbb5895abeff8d71d795bff78b92938f2 /ext | |
| parent | f67ec05c018a3fe602c17383966d67b4e05bad6b (diff) | |
| download | facter-7ecba715c4b19b2ab1f181b2b1bad256b2cdf512.tar.gz facter-7ecba715c4b19b2ab1f181b2b1bad256b2cdf512.tar.xz facter-7ecba715c4b19b2ab1f181b2b1bad256b2cdf512.zip | |
(#4567) Retain detached HEAD state
Allow facter-diff to start in and return to a detached HEAD
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/facter-diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/facter-diff b/ext/facter-diff index 361b80b..d74f316 100755 --- a/ext/facter-diff +++ b/ext/facter-diff @@ -49,9 +49,9 @@ status=$(git status -s) test -z "$status" || die "fatal: $0 cannot be used with a dirty working copy" -origin=$(git name-rev --name-only HEAD) -test -n "$origin" || - die "fatal: $0 cannot be used unless currently on a branch" +origin=$(git rev-parse --symbolic-full-name HEAD) +test "$origin" = "HEAD" && + origin=$(git rev-parse HEAD) test -x "bin/facter" || die "fatal: $0 must be run from the project root" |