From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 10 May 2018 12:43:00 +0000 (+0000)
Subject: git-p4: change "commitish" typo to "committish"
X-Git-Tag: v2.18.0-rc0~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89f32a92b4f04ab93fc52ef16fa628cbb2bddd7d;p=thirdparty%2Fgit.git

git-p4: change "commitish" typo to "committish"

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>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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()