Project

General

Profile

Actions

Bug #9913

closed

git pbchk should still accept -b

Added by Joshua M. Clulow almost 3 years ago. Updated almost 3 years ago.

Status:
Closed
Priority:
Normal
Category:
tools - gate/build tools
Start date:
2018-10-20
Due date:
% Done:

100%

Estimated time:
Difficulty:
Bite-size
Tags:
Gerrit CR:

Description

In #9825, we changed the flag for nomination of a parent commit accepted by git pbchk and git nits from -p to -b. Though we sought to silently accept -b for backwards compatibility with existing consumers, the change didn't quite get there. We should fix that up.


Related issues

Related to illumos gate - Bug #9825: pbchk -b option should be -pClosedJohn Levon2018-09-10

Actions
Actions #1

Updated by Joshua M. Clulow almost 3 years ago

  • Related to Bug #9825: pbchk -b option should be -p added
Actions #2

Updated by John Levon almost 3 years ago

Ugh, apologies. I actually thought I'd tested this :(

Actions #3

Updated by Joshua M. Clulow almost 3 years ago

  • Status changed from New to In Progress

Testing Notes

Build type   is  non-DEBUG
RELEASE      is 
VERSION      is rti-master-0-gbc4c0ff134
RELEASE_DATE is October 2018

The top-level 'setup' target is available to build headers and tools.

Using /bin/bash as shell.
jclulow@oi0 usr/src illumos:rti 
 $ git pbchk -b HEAD^
option -b not recognized
Usage: git-pbchk [-c check] [-p branch] [path...]
jclulow@oi0 usr/src illumos:rti 
 $ git pbchk -p HEAD^

jclulow@oi0 usr/src illumos:rti 
 $ git apply --verbose /var/tmp/9913.patch 
Checking patch usr/src/tools/scripts/git-pbchk.py...
Hunk #1 succeeded at 375 (offset 1 line).
Applied patch usr/src/tools/scripts/git-pbchk.py cleanly.
jclulow@oi0 usr/src illumos:rti 
 $ (cd tools/scripts && dmake -m serial install)
/usr/bin/rm -f git-pbchk; /usr/bin/sed -e "1s:^\#!@PYTHON@:\#!/usr/bin/python2.7:" < git-pbchk.py > git-pbchk; /usr/bin/chmod +x git-pbchk
/usr/bin/rm -f /ws/rti/usr/src/tools/proto/root_i386-nd/opt/onbld/bin/git-pbchk; /ws/rti/usr/src/tools/proto/root_i386-nd/opt/onbld/bin/i386/install -s -m 0555 -f /ws/rti/usr/src/tools/proto/root_i386-nd/opt/onbld/bin git-pbchk

jclulow@oi0 usr/src illumos:rti 
 $ git pbchk -b HEAD^
jclulow@oi0 usr/src illumos:rti 
 $ git pbchk -p HEAD^
Actions #4

Updated by Electric Monk almost 3 years ago

  • Status changed from In Progress to Closed
  • % Done changed from 0 to 100

git commit 42a3762d0138d6dd0c0f96964be98d0b21ab6bef

commit  42a3762d0138d6dd0c0f96964be98d0b21ab6bef
Author: Joshua M. Clulow <josh@sysmgr.org>
Date:   2018-10-22T19:19:58.000Z

    9913 git pbchk should still accept -b
    Reviewed by: Toomas Soome <tsoome@me.com>
    Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
    Approved by: Garrett D'Amore <garrett@damore.org>

Actions

Also available in: Atom PDF