diff options
| author | Dabrien 'Dabe' Murphy | 2014-07-22 18:14:03 -0400 |
|---|---|---|
| committer | Jack Nagel | 2014-07-23 21:07:02 -0500 |
| commit | 46ca68de5e0cab145c641cfbff929ae65efad50c (patch) | |
| tree | 535f40c6e3c68ad277b70b0df6bbb667b3d3bba7 | |
| parent | 9c5149b85a77dac259342925c7cd6f5b13a54f03 (diff) | |
| download | brew-46ca68de5e0cab145c641cfbff929ae65efad50c.tar.bz2 | |
Modify "git rev-parse --verify" args in "has_ref?"
Per the `git-rev-parse(1)` manpage:
--verify Verify that exactly one parameter is provided, and that it
can be turned into a raw 20-byte SHA-1 that can be used to access the
object database. If so, emit it to the standard output; otherwise,
error out.
If you want to make sure that the output actually names an object in
your object database and/or can be used as a specific type of object
For example, git rev-parse "$VAR^{commit}" will make sure $VAR names
an existing object that is a commit-ish (i.e. a commit, or an
annotated tag that points at a commit).
That actually means that:
git rev-parse --verify af8e768e2bd3b4398bca033998f83b0eb8874914
will _always_ return the SHA-1 hash — regardless of whether or not
that's actually a valid reference!
Thus, when `GitDownloadStragtegy#update_repo` tries to check
`has_ref?`, it mistakenly succeeds, and doesn't actually do a `git fetch
origin`.
The fix is to use:
git rev-parse --verify "af8e768e2bd3b4398bca033998f83b0eb8874914^{commit}"
Fixes Homebrew/homebrew#31045.
Closes Homebrew/homebrew#31054.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Homebrew/download_strategy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index b61a994a3..e7478bb4f 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -515,7 +515,7 @@ class GitDownloadStrategy < VCSDownloadStrategy end def has_ref? - quiet_system 'git', '--git-dir', git_dir, 'rev-parse', '-q', '--verify', @ref + quiet_system 'git', '--git-dir', git_dir, 'rev-parse', '-q', '--verify', "#{@ref}^{commit}" end def repo_valid? |
