t/t9*: merge "grep | sed" pipelines
Signed-off-by: Beat Bolli <dev+git@drbeat.li> Acked-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Beat Bolli committed
Mar 15, 2024 at 20:46 UTC
babf0b89b383116c9b7aee5a2c3dee3ae1237d65
3 files changed
+3
-3
t/t9118-git-svn-funky-branch-names.sh
+1
-1
@@ -38,7 +38,7 @@ test_expect_success 'setup svnrepo' '
38
# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
39
# Look at what SVN wound up naming the branch and use that.
40
# Be sure to escape the @ if it shows up.
41
-non_reflog=$(svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/')
41
+non_reflog=$(svn_cmd ls "$svnrepo/pr ject/branches" | sed -ne '/not-a/ { s/\///; s/@/%40/; p }')
42
43
test_expect_success 'test clone with funky branch names' '
44
git svn clone -s "$svnrepo/pr ject" project &&
t/t9350-fast-export.sh
+1
-1
@@ -537,7 +537,7 @@ test_expect_success 'full-tree re-shows unmodified files' '
537
538
test_expect_success 'set-up a few more tags for tag export tests' '
539
git checkout -f main &&
540
- HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
540
+ HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
541
git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
542
git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
543
git tag tag-obj_tag -m "tagging a tag" tree_tag-obj &&
t/t9824-git-p4-git-lfs.sh
+1
-1
@@ -18,7 +18,7 @@ test_file_in_lfs () {
18
sed -n '3,3 p' "$FILE" | grep "^size " &&
19
test_line_count = 3 "$FILE" &&
20
grep "size $SIZE" "$FILE" &&
21
- HASH=$(grep "oid sha256:" "$FILE" | sed -e "s/oid sha256://g") &&
21
+ HASH=$(sed -ne "/oid sha256:/s/oid sha256://gp" "$FILE") &&
22
LFS_FILE=".git/lfs/objects/$(echo "$HASH" | cut -c1-2)/$(echo "$HASH" | cut -c3-4)/$HASH" &&
23
echo $EXPECTED_CONTENT >expect &&
24
test_path_is_file "$FILE" &&