3170876d25
User-visible changes: - fix 'got send' with tree objects which contain symlinks - tog: show parent commit IDs of merge commits in the diff view - add a 'got merge' command for creating merge commits - fix 'got update' of an added + obstructed file - don't change bad symlinks into regular files during merges - fix 'got fetch' downloading too many objects in some cases - interrupt 'got rebase' upon missing/unversioned/not-deleted files - interrupt 'got histedit' upon missing/unversioned/not-deleted files - add histedit -e option which runs the 'edit' script command for every commit - skip ignored directories during 'got status' disk crawl
38 lines
966 B
Bash
38 lines
966 B
Bash
--- regress/cmdline/histedit.sh.orig 2021-10-04 10:11:31 UTC
|
|
+++ regress/cmdline/histedit.sh
|
|
@@ -1561,7 +1561,7 @@ test_histedit_fold_only() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 's/.*/committing folded changes/' "\$1"
|
|
+sed -i '' 's/.*/committing folded changes/' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|
|
@@ -1677,7 +1677,7 @@ test_histedit_fold_only_empty_logmsg() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 'd' "\$1"
|
|
+sed -i '' 'd' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|
|
@@ -1811,7 +1811,7 @@ test_histedit_edit_only() {
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 's/.*/committing edited changes 1/' "\$1"
|
|
+sed -i '' 's/.*/committing edited changes 1/' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|
|
@@ -1840,7 +1840,7 @@ EOF
|
|
|
|
cat > $testroot/editor.sh <<EOF
|
|
#!/bin/sh
|
|
-sed -i 's/.*/committing edited changes 2/' "\$1"
|
|
+sed -i '' 's/.*/committing edited changes 2/' "\$1"
|
|
EOF
|
|
chmod +x $testroot/editor.sh
|
|
|