Skip to content

Commit 90b120f

Browse files
committed
Minor fixups
Clean up the help text. Clarify a comment.
1 parent fa48d71 commit 90b120f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

git-filter-repo

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ EXAMPLES
20322032
contents.add_argument('--blobbase', metavar='BLOB-SHAS-AND-PATHS',
20332033
help=_("Process an annotated blob-shas-and-paths.txt file. 'blobbase' "
20342034
"because it uses a command system similar to git's interactive "
2035-
"rebase. Commands: k, keep <sha> = keep blob; s, strip <sha> = "
2035+
"rebase. Commands: k, keep sha = keep blob; s, strip sha = "
20362036
"strip blob. Keep is the default if no command has been "
20372037
"specified."))
20382038

@@ -2454,9 +2454,11 @@ EXAMPLES
24542454
if args.blobbase:
24552455
# Commands: k, keep = keep blob; s, strip = strip blob. No command means keep.
24562456
with open(args.blobbase, 'br') as f:
2457-
# Header lines start with "===" or "Format:"
2458-
# Blank lines are blank, comments start with "#"
2459-
# Not annotating a blob is interpreted as "keep", keep is keep
2457+
# Header lines start with '===' or 'Format:'
2458+
# Blank lines are blank, comments start with '#'
2459+
# Not annotating a blob is interpreted as 'keep', keep is keep
2460+
# Pathbase match lines start with 'm'. This means one blob_shas_and_paths can be annotated for use with both
2461+
# blobbase and pathbase.
24602462
# All this has to do is find the strip lines which are distinct from the above lines
24612463
# git.git:sequencer.c:parse_insn_line() does not require the command to be in the first column
24622464
args.strip_blobs_with_ids.update(parts[1] for parts in (line.split() for line in f) if len(parts) >= 2 and parts[0].decode()[0:1] == 's')

0 commit comments

Comments
 (0)