rebases 2.0.0 head patches

skaes · May 18, 2014 · 3a9f493 · 3a9f493
1 parent fcf9970
commit 3a9f493
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/patches/ruby/2.0.0/head/railsexpress/03-display-more-detailed-stack-trace.patch b/patches/ruby/2.0.0/head/railsexpress/03-display-more-detailed-stack-trace.patch
@@ -1,8 +1,8 @@
 diff --git a/eval_error.c b/eval_error.c
-index c7ccf82..50b9c40 100644
+index 54d6db9..a9a1a0b 100644
 --- a/eval_error.c
 +++ b/eval_error.c
-@@ -177,8 +177,8 @@ error_print(void)
+@@ -178,8 +178,8 @@ error_print(void)
          int skip = eclass == rb_eSysStackError;
 
  #define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)

diff --git a/patches/ruby/2.0.0/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch b/patches/ruby/2.0.0/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
@@ -1,5 +1,5 @@
 diff --git a/eval.c b/eval.c
-index b5f41e6..4ba414b 100644
+index 78a5d88..326b526 100644
 --- a/eval.c
 +++ b/eval.c
 @@ -444,8 +444,7 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)

diff --git a/patches/ruby/2.0.0/head/railsexpress/05-fix-missing-c-return-event.patch b/patches/ruby/2.0.0/head/railsexpress/05-fix-missing-c-return-event.patch
@@ -1,5 +1,5 @@
 diff --git a/eval.c b/eval.c
-index 4ba414b..e6c3e5f 100644
+index 326b526..56f60c4 100644
 --- a/eval.c
 +++ b/eval.c
 @@ -933,7 +933,18 @@ rb_frame_caller(void)
@@ -115,7 +115,7 @@ index c6a23cc..5c4a902 100644
 +
  end
 diff --git a/vm_eval.c b/vm_eval.c
-index 7644aff..c040ca7 100644
+index b584213..83879a7 100644
 --- a/vm_eval.c
 +++ b/vm_eval.c
 @@ -684,7 +684,7 @@ raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,