Elijah Newren [off-list ref] writes:
quoted hunk
Signed-off-by: Elijah Newren <redacted>
---
t/t5520-pull.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 319e389..9099e55 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -4,6 +4,11 @@ test_description='pulling into void'
. ./test-lib.sh
+modify () {
+ sed -e "$1" < "$2" > "$2".x &&
+ mv "$2".x "$2"
+}
Just a style thing but I'd prefer to see the above written like this:
modify () {
sed -e "$1" <"$2" >"$2.x" &&
mv "$2.x" "$2"
}
+test_expect_success 'setup for avoiding reapplying old patches' '
+ (cd dst &&
+ git rebase --abort;
This may be hypothetical but this discards error condition from failing to
ch into dst (for whatever reason). Don't we expect "git rebase --abort"
to exit with a non-zero status? Same comment for the last one in the
patch below.
+test_expect_failure 'git pull --rebase does not reapply old patches' '
+ (cd dst &&
+ git pull --rebase;
+ test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+ )
+'
+
test_done
Thanks.
On Mon, Aug 9, 2010 at 1:09 PM, Junio C Hamano [off-list ref] wrote:
Elijah Newren [off-list ref] writes:
<snip>
quoted
+modify () {
+ sed -e "$1" < "$2" > "$2".x &&
+ mv "$2".x "$2"
+}
Just a style thing but I'd prefer to see the above written like this:
modify () {
sed -e "$1" <"$2" >"$2.x" &&
mv "$2.x" "$2"
}
I copied this function verbatim from t/t4127-apply-same-fn.sh. Would
you like me to fix that one too?
quoted
+test_expect_success 'setup for avoiding reapplying old patches' '
+ (cd dst &&
+ git rebase --abort;
This may be hypothetical but this discards error condition from failing to
ch into dst (for whatever reason). Don't we expect "git rebase --abort"
to exit with a non-zero status? Same comment for the last one in the
patch below.
Yes, Hannes pointed out the same issue. Does the follow-up interdiff
I posted in response to my patch address this in a way you'd like?
On Mon, Aug 9, 2010 at 19:22, Elijah Newren [off-list ref] wrote:
On Mon, Aug 9, 2010 at 1:09 PM, Junio C Hamano [off-list ref] wrote:
quoted
Elijah Newren [off-list ref] writes:
<snip>
quoted
quoted
+modify () {
+ sed -e "$1" < "$2" > "$2".x &&
+ mv "$2".x "$2"
+}
Just a style thing but I'd prefer to see the above written like this:
modify () {
sed -e "$1" <"$2" >"$2.x" &&
mv "$2.x" "$2"
}
I copied this function verbatim from t/t4127-apply-same-fn.sh. Would
you like me to fix that one too?
Rather than copy-paste this around we should just turn it into a
utility function.
It'd be very useful (if you're up to it) to just use sed in this
patch, then submit another patch to include the modify() function in
the test-lib.sh (and document it in t/README).
These could also use a modify():
cd t && grep -A1 sed *sh | grep -B1 mv | less