summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@torproject.org>2018-01-24 17:34:49 +0100
committerNicolas Vigier <boklm@torproject.org>2018-01-24 17:34:49 +0100
commit8d2cb3efee650fdc7f167a760772eeaddbeec7a7 (patch)
treeb7f4840100635ae59b4717c05659c9e0769f6267
parent5c89374df7957238a9565c0b938ee3f30f880438 (diff)
Bug 25004: rename abbrev_lenght to abbrev_lengthbug_25004
-rw-r--r--NEWS2
-rw-r--r--doc/options_misc.asc4
-rw-r--r--lib/RBM/DefaultConfig.pm4
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index d517840..256cad9 100644
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@
- Add support for external input files, documented in burps_input_files(7)
-- Add the abbrev and abbrev_lenght options
+- Add the abbrev and abbrev_length options
- Add the tar option, to create deterministic tar files
diff --git a/doc/options_misc.asc b/doc/options_misc.asc
index 3b3b877..876768b 100644
--- a/doc/options_misc.asc
+++ b/doc/options_misc.asc
@@ -17,8 +17,8 @@ abbrev::
This option returns the abbreviated commit hash of the +git_hash+
or +hg_hash+ commit.
-abbrev_lenght::
- This option sets the lenght of the abbreviated commits, when
+abbrev_length::
+ This option sets the length of the abbreviated commits, when
using the +abbrev+ option.
tar::
diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm
index d0d893a..4121264 100644
--- a/lib/RBM/DefaultConfig.pm
+++ b/lib/RBM/DefaultConfig.pm
@@ -129,10 +129,10 @@ our %default_config = (
build_log_append => '1',
notmpl => [ qw(projects_dir) ],
describe => \&git_describe,
- abbrev_lenght => '12',
+ abbrev_length => '12',
abbrev => '[%
IF c("git_url");
- exec("git log -1 --abbrev=" _ c("abbrev_lenght") _ " --format=%h " _ c("git_hash"));
+ exec("git log -1 --abbrev=" _ c("abbrev_length") _ " --format=%h " _ c("git_hash"));
ELSE;
exec(c("hg") _ " id -i -r " _ c("hg_hash"));
END;