Skip to content

Commit

Permalink
Use a fixed abbreviation size in git describe output
Browse files Browse the repository at this point in the history
Currently, this setting depends on whatever the user of `godep` has in
their `git config --get core.abbrev`, if it is set.

Even when it is not set, the number of characters used in the shortened
git commit will depend on whether there are collisions for that prefix
on the local repository (which in large part depends on how much
activity exists there.)

As a result, when multiple users are maintaining Godeps/ for a single
project, many spurious changes to Godeps/Godeps.json are generated due
to the lack of stability in the length of the abbreviated commit in
output of `git describe`.

Let's fix this by enforcing a reasonable abbreviation length in godep's
use of `git describe`. 14 characters is very unlikely to result in
collisions for prefixes.
  • Loading branch information
filbranden authored and cblecker committed Nov 6, 2018
1 parent 57e1d0a commit db89546
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion third_party/forked/godep/vcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var vcsGit = &VCS{
vcs: vcs.ByCmd("git"),

IdentifyCmd: "rev-parse HEAD",
DescribeCmd: "describe --tags",
DescribeCmd: "describe --tags --abbrev=14",
DiffCmd: "diff {rev}",
ListCmd: "ls-files --full-name",
RootCmd: "rev-parse --show-cdup",
Expand Down

0 comments on commit db89546

Please sign in to comment.