From: Junio C Hamano <gitster@pobox.com>
To: Joel Holdsworth <jholdsworth@nvidia.com>
Cc: git@vger.kernel.org, Luke Diamand <luke@diamand.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>,
Dorgon Chang <dorgonman@hotmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>,
Daniel Levin <dendy.ua@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Ben Keene <seraphire@gmail.com>,
Andrew Oakley <andrew@adoakley.name>
Subject: Re: [PATCH v3 02/21] git-p4: remove unneeded semicolons from statements
Date: Sun, 16 Jan 2022 18:19:32 -0800 [thread overview]
Message-ID: <xmqqczkrxfwr.fsf@gitster.g> (raw)
In-Reply-To: <20220116160550.514637-3-jholdsworth@nvidia.com> (Joel Holdsworth's message of "Sun, 16 Jan 2022 16:05:31 +0000")
Joel Holdsworth <jholdsworth@nvidia.com> writes:
> @@ -4119,9 +4119,9 @@ def run(self, args):
>
> def rebase(self):
> if os.system("git update-index --refresh") != 0:
> - die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
> - if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
> - die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
> + die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.")
> + if len(read_pipe("git diff-index HEAD --")) > 0:
> + die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
>
> [upstream, settings] = findUpstreamBranchPoint()
> if len(upstream) == 0:
I think this is the most likely culprit behind the CI breakage at
https://github.com/git/git/runs/4834693517?check_suite_focus=true#step:5:1643
You made read_pipe() to refuse to take string-form of command in
another topic in 'next', and this series are built on what is in
'next', but apparently this hunk does MUCH MORE than "remove
unneeded semicolons"---at least here it reverts the "read_pipe() no
longer takes a string-form of external command".
next prev parent reply other threads:[~2022-01-17 2:19 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-16 16:05 [PATCH v3 00/21] git-p4: Various code tidy-ups Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 01/21] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 02/21] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-01-17 2:19 ` Junio C Hamano [this message]
2022-01-16 16:05 ` [PATCH v3 03/21] git-p4: indent with 4-spaces Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 04/21] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 05/21] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 06/21] git-p4: remove commented code Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 07/21] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 08/21] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 09/21] git-p4: remove spaces around default arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 10/21] git-p4: removed brackets when assigning multiple return values Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 11/21] git-p4: place a single space after every comma Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 12/21] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 13/21] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 14/21] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 15/21] git-p4: ensure every comment has a single # Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 16/21] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 17/21] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 18/21] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 19/21] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 20/21] git-p4: move inline comments to line above Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 21/21] git-p4: seperate multiple statements onto seperate lines Joel Holdsworth
2022-01-17 1:34 ` [PATCH v3 00/21] git-p4: Various code tidy-ups Junio C Hamano
2022-02-03 21:22 ` Joel Holdsworth
2022-02-03 21:30 ` Junio C Hamano
2022-02-04 12:27 ` Joel Holdsworth
2022-02-04 17:16 ` Junio C Hamano
2022-01-17 2:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqczkrxfwr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=jholdsworth@nvidia.com \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tzadik.vanderhoof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.