Skip to content

Fix "Could not checkout. Do you have uncommitted changes?" error #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
b-deam merged 3 commits into from
Aug 29, 2023
+11 −0
Merged

Fix "Could not checkout. Do you have uncommitted changes?" error #1772

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c95c0
Strip whitespace from 'revision' args
b-deam Aug 29, 2023
045284b
Update esrally/rally.py
b-deam Aug 29, 2023
e2a0e0e
Rename type function
b-deam Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions esrally/rally.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ def supported_es_version(v):
raise argparse.ArgumentTypeError(f"must be at least {min_es_version} but was {v}")
return v

def revision(v):
return v.strip()

def add_track_source(subparser):
track_source_group = subparser.add_mutually_exclusive_group()
track_source_group.add_argument(
Expand All @@ -114,6 +117,7 @@ def add_track_source(subparser):
"--track-revision",
help="Define a specific revision in the track repository that Rally should use.",
default=None,
type=revision,
)

# try to preload configurable defaults, but this does not work together with `--configuration-name` (which is undocumented anyway)
Expand Down Expand Up @@ -295,6 +299,7 @@ def add_track_source(subparser):
'e.g. "@2013-07-27T10:37:00Z" (default: current). A combination of branch and timestamp is also possible,'
'e.g. "@feature-branch@2023-04-06T14:52:31Z".',
default="current",
type=revision,
) # optimized for local usage, don't fetch sources
build_parser.add_argument(
"--target-os",
Expand All @@ -313,6 +318,7 @@ def add_track_source(subparser):
"--team-revision",
help="Define a specific revision in the team repository that Rally should use.",
default=None,
type=revision,
)
build_parser.add_argument(
"--team-path",
Expand Down Expand Up @@ -355,6 +361,7 @@ def add_track_source(subparser):
"--team-revision",
help="Define a specific revision in the team repository that Rally should use.",
default=None,
type=revision,
)
download_parser.add_argument(
"--team-path",
Expand Down Expand Up @@ -399,6 +406,7 @@ def add_track_source(subparser):
' The timestamp must be specified as: "@ts" where "ts" must be a valid ISO 8601 timestamp, '
'e.g. "@2013-07-27T10:37:00Z" (default: current).',
default="current",
type=revision,
) # optimized for local usage, don't fetch sources
# Intentionally undocumented as we do not consider Docker a fully supported option.
install_parser.add_argument(
Expand All @@ -416,6 +424,7 @@ def add_track_source(subparser):
"--team-revision",
help="Define a specific revision in the team repository that Rally should use.",
default=None,
type=revision,
)
install_parser.add_argument(
"--team-path",
Expand Down Expand Up @@ -571,6 +580,7 @@ def add_track_source(subparser):
"--team-revision",
help="Define a specific revision in the team repository that Rally should use.",
default=None,
type=revision,
)

race_parser.add_argument(
Expand All @@ -591,6 +601,7 @@ def add_track_source(subparser):
' The timestamp must be specified as: "@ts" where "ts" must be a valid ISO 8601 timestamp, '
'e.g. "@2013-07-27T10:37:00Z" (default: current).',
default="current",
type=revision,
) # optimized for local usage, don't fetch sources
add_track_source(race_parser)
race_parser.add_argument(
Expand Down