Two fixes that are not rebases

lib/calendar.ts

@@ -1728,7 +1728,7 @@ abstract class GregorianBaseHelper extends HelperBase {
         // Prefer displaying an era alias, instead of "gregory-inverse"
         const preferredName = names?.[0];
         const expected = preferredName ? `${value} (also called ${preferredName})` : value;
-        throw new RangeErrorCtor(`Input ${name} ${currentValue} doesn't match calculated value ${expected}`);
+        throw new RangeErrorCtor(`Input ${property} ${currentValue} doesn't match calculated value ${expected}`);
       }
     };
     const eraFromYear = (year: number) => {

tools/rebase-upstream-commits.ts

@@ -167,6 +167,7 @@ try running this tool's "rebasehelp" command.
       // We want this to show up in the same TTY that this tool was launched in.
       stdio: 'inherit',
       env: {
+        ...process.env,
         GIT_SEQUENCE_EDITOR: gitSequenceEditorCmd,
         PATH: process.env['PATH']
       }