Re: [PATCH v4 3/6] git-p4: change "commitish" typo to "committish"
- From
Luke Diamand <luke@diamand.org>
- Date
- May 10, 2018, 15:00 UTC
- Message-ID
- <CAE5ih7-MKQoB27MKd0jJ91O+uKm8e2X5h8OcEaaGJAoYdWL5XQ@mail.gmail.com>
- In-Reply-To
- <20180510124303.6020-4-avarab@gmail.com>
On 10 May 2018 at 13:43, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
Show 5 quoted lines
> This was the only occurrence of "commitish" in the tree, but as the
> log will reveal we've had others in the past. Fixes up code added in
> 00ad6e3182 ("git-p4: work with a detached head", 2015-11-21).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>Looks good to me!
Thanks, Luke
Show 26 quoted lines
> --- > git-p4.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/git-p4.py b/git-p4.py > index 7bb9cadc69..1afa87cd9d 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -2099,11 +2099,11 @@ class P4Submit(Command, P4UserMap): > > commits = [] > if self.master: > - commitish = self.master > + committish = self.master > else: > - commitish = 'HEAD' > + committish = 'HEAD' > > - for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, commitish)]): > + for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, committish)]): > commits.append(line.strip()) > commits.reverse() > > -- > 2.17.0.410.g4ac3413cc8 >