Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions docs/reference/Blame/Methods/getHunkByIndex.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class Blame {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down Expand Up @@ -90,6 +95,11 @@ class Blame {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
10 changes: 10 additions & 0 deletions docs/reference/Blame/Methods/getHunkByLine.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class Blame {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down Expand Up @@ -90,6 +95,11 @@ class Blame {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Commit/Methods/author.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Commit {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Commit/Methods/authorWithMailmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ class Commit {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Commit/Methods/committer.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Commit {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Commit/Methods/committerWithMailmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ class Commit {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Mailmap/Methods/resolveSignature.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class Mailmap {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Note/Methods/author.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Note {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Note/Methods/committer.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Note {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Reflog/Methods/append.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ class Reflog {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/ReflogEntry/Methods/committer.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class ReflogEntry {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Signature/createSignature.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ function createSignature(
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
5 changes: 5 additions & 0 deletions docs/reference/Tag/Methods/tagger.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class Tag {
<br>
<p class="param-description">Name on the signature.</p>
</li>
<li class="param-li">
<span class="param-name">offset</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
<p class="param-description">Timezone offset, in minutes</p>
</li>
<li class="param-li">
<span class="param-name">timestamp</span><span class="param-required">required</span>&nbsp;·&nbsp;<span class="param-type">number</span>
<br>
Expand Down
2 changes: 2 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8956,6 +8956,8 @@ export interface Signature {
email: string
/** Time in seconds, from epoch */
timestamp: number
/** Timezone offset, in minutes */
offset: number
}

export interface SignaturePayload {
Expand Down
10 changes: 9 additions & 1 deletion src/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ pub struct Signature {
pub email: String,
/// Time in seconds, from epoch
pub timestamp: i64,
/// Timezone offset, in minutes
pub offset: i32,
}

impl<'a> TryFrom<git2::Signature<'a>> for Signature {
Expand All @@ -21,7 +23,13 @@ impl<'a> TryFrom<git2::Signature<'a>> for Signature {
let name = std::str::from_utf8(value.name_bytes())?.to_string();
let email = std::str::from_utf8(value.email_bytes())?.to_string();
let timestamp = value.when().seconds();
Ok(Self { name, email, timestamp })
let offset = value.when().offset_minutes();
Ok(Self {
name,
email,
timestamp,
offset,
})
}
}

Expand Down
15 changes: 13 additions & 2 deletions tests/rebase.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
import fs from 'node:fs/promises';
import path from 'node:path';
import { describe, expect, it } from 'vitest';
import { openRepository, type RebaseOperation } from '../index';
import { openRepository, type RebaseOperation, type Signature, type SignaturePayload } from '../index';
import { useFixture } from './fixtures';

describe('rebase', () => {
it('rebase (no-conflict): feature onto main', async () => {
const p = await useFixture('empty');
const repo = await openRepository(p);
const sig = { name: 'Test User', email: 'test@example.com' };
const sig = {
name: 'Test User',
email: 'test@example.com',
timeOptions: { timestamp: 1678886400, offset: 0 },
} satisfies SignaturePayload;
const expectedCommitter: Signature = {
name: sig.name,
email: sig.email,
timestamp: sig.timeOptions.timestamp,
offset: sig.timeOptions.offset,
};

// initial commit (o0)
let index = repo.index();
Expand Down Expand Up @@ -79,6 +89,7 @@ describe('rebase', () => {
const featureAfter = repo.getReference('refs/heads/feature').target()!;
const featureCommit = repo.getCommit(featureAfter);
expect(featureCommit.message()).toBe('feat-1');
expect(featureCommit.committer()).toEqual(expectedCommitter);
expect(repo.getMergeBase(featureAfter, o1)).toEqual(o1);

const mainStatus = repo.getStatusFile('main.txt');
Expand Down