feat(gitutils): add git fix date #28

Copilot · 2025-10-03T10:55:31Z

Overview

Implements a new git fix date command that allows correcting commit times in git history with advanced rescheduling capabilities for specific days of the week. Includes sensible defaults for weekday work hours, a dry-run mode for previewing changes, and an interactive confirmation prompt for safety.

Problem

There was no built-in way to:

Correct commit times across git history from a specific commit onwards
Reschedule commits that fall outside desired work hours on specific days
Maintain absolute sequential order when adjusting commit times
Preview changes before applying them
Get confirmation before rewriting git history

Solution

Added src/gitutils/_git-fix-date.sh that provides:

Core Functionality

Rewrite commit dates/times starting from any commit in history
Reschedule commits on specific weekdays (0=Sunday, 1=Monday, ..., 6=Saturday)
Split time ranges into two halves with different target times
Preserves sequential order of commits (critical requirement)
Only modifies time, never the date itself
Dry-run mode to preview changes without applying them
Default values for common use case (weekday work hours)
Interactive confirmation before rewriting history

Default Values

The command includes sensible defaults for typical weekday work hour rescheduling:

Days: 1,2,3,4,5 (Monday-Friday)
Start time: 08:00
End time: 17:00
Before time: 06:00 (first half target)
After time: 20:00 (second half target)

Usage

# Preview changes with default values (dry-run mode, no confirmation)
git fix date -d

# Apply default weekday rescheduling (shows plan and asks for confirmation)
git fix date -f

# Custom parameters - reschedule weekend commits
git fix date -f -r 0,6 -s 08:00 -e 20:00 -b 07:00 -a 21:00

Options

-f - Force mode to allow overwriting pushed history
-p - Push changes after rewriting history
-d - Dry-run mode: display change plan without applying changes or asking for confirmation
-r <days> - Days of week to reschedule (default: 1,2,3,4,5; comma-separated, 0-6)
-s <start> - Start time of range (default: 08:00; HH:MM format)
-e <end> - End time of range (default: 17:00; HH:MM format)
-b <before> - Time to move first half commits to (default: 06:00; HH:MM)
-a <after> - Time to move second half commits to (default: 20:00; HH:MM)

Example: Dry-Run Mode

Preview changes before applying:

git fix date -d

Output:

=== Change Plan ===

a1b2c3d | 2024-03-04 09:00:00 → 2024-03-04 06:00:00 | Monday morning work
e4f5g6h | 2024-03-04 14:00:00 → 2024-03-04 20:00:00 | Monday afternoon work

=== End of Change Plan ===

Dry run complete. No changes were made.

Example: Apply with Confirmation

Apply changes with interactive confirmation:

git fix date -f

The command will display the change plan and prompt:

This will rewrite git history. Make sure you understand the consequences.
Do you want to proceed? (y/N)

Example: Custom Parameters

Reschedule all Sunday commits between 8:00 and 20:00:

git fix date -f -r 0 -s 08:00 -e 20:00 -b 07:30 -a 20:30

Result:

Sunday 09:30 → 07:30 (first half, before midpoint)
Sunday 11:00 → 07:30 (first half)
Sunday 15:00 → 20:30 (second half, after midpoint)
Sunday 18:00 → 20:30 (second half)
All other days remain unchanged
Sequential order is preserved

Technical Implementation

Uses two-pass approach: first pass analyzes and determines new times, second pass applies them via git filter-branch
Temporary mapping file stores commit SHA to new date mappings
Always displays change plan before execution
Interactive confirmation prompt in normal mode (skipped in dry-run mode)
Dry-run mode outputs change plan and exits without confirmation
Assumes git utilities are available (simplified implementation)
Follows repository patterns using zz_args, zz_log utilities
Integrates with existing git fix dispatcher (alongside git fix emoji, git fix author, etc.)

Files Changed

✅ src/gitutils/_git-fix-date.sh - New script with defaults, dry-run mode, and confirmation prompt
✅ src/gitutils/README.md - Added comprehensive documentation with examples
✅ .gitignore - Excluded development symlinks from version control

Testing

Verified with multiple test scenarios:

✅ Single day rescheduling (Sunday only)
✅ Multiple days (Saturday and Sunday together)
✅ Default values with weekday commits
✅ Dry-run mode with output and no confirmation
✅ Normal mode with change plan display and confirmation prompt
✅ Sequential order preservation
✅ Non-target days remain unchanged
✅ Time range filtering works correctly

Fixes #27

Original prompt

This section details on the original issue you should resolve

<issue_title>Git fix date</issue_title>
<issue_description>Créer un script bash "gix fix date" sur le même modèle que les scripts existants pour corriger les heures de chaque commit de l'historique à partir d'un commit donné.

Proposer une option pour rééchelonner les heures en dehors d'une certaine plage horaire pour des jours de semaine donnés.

Ex: rééchelonner les commits du dimanche entre 8h et 20h avant le dimanche 8h pour la première moitié 8h-14h, après le dimanche 20h pour la deuxième moitié 14h-20h.

L'ordre séquenciel des comits doit être absolument respecté. La date ne doit en aucun cas être changée, seule l'heure doit être modifiée.</issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes #27

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

tomgrv · 2025-10-03T11:55:42Z

@copilot here are default values:
day: 1 to 5
Start: 8:00
End: 17:00
Before: 6:00
After: 20:00

Assume git utilities are available, do not provide alternatives

Introduce dry mode where change plan is output to stderr

Copilot · 2025-10-03T12:01:12Z

@copilot here are default values:
day: 1 to 5
Start: 8:00...

Done in commit 07c534f. Changes made:

Default values added:
- Days: 1,2,3,4,5 (Mon-Fri)
- Start: 08:00
- End: 17:00
- Before: 06:00
- After: 20:00
Dry-run mode (-n flag): Outputs change plan to stderr showing commit SHA, time changes, and message without applying changes.
Simplified code: Removed alternative code for git getcommit - now assumes git utilities are available.

Usage:

# Preview with defaults
git fix date -n

# Apply defaults
git fix date -f

tomgrv · 2025-10-03T12:22:05Z

@copilot use -d for dry run and -r for 'days to reschedule'

Alway Display plan and ask for confirmation before proceeding

Copilot · 2025-10-03T12:27:46Z

@copilot use -d for dry run and -r for 'days to reschedule'

Alway Display plan and ask for confirmation before proceeding...

Done in commit ff6104f. Changes made:

Flag changes:
- Dry-run mode: -n → -d
- Days to reschedule: -d → -r
Always display plan and ask for confirmation:
- Change plan is now always shown (not just in dry-run mode)
- Confirmation prompt added: "Do you want to proceed? (y/N)"
- Dry-run mode skips confirmation and exits after displaying plan

Usage:

# Dry-run (no confirmation)
git fix date -d

# Apply with confirmation
git fix date -f

# Custom days
git fix date -f -r 0,6

Copilot

Pull Request Overview

This PR implements a new git fix date command that allows correcting commit times in git history with advanced rescheduling capabilities for specific days of the week. The feature provides sensible defaults for weekday work hours (Monday-Friday, 08:00-17:00), includes a dry-run mode for previewing changes, and requires interactive confirmation before rewriting git history.

Key changes include:

Added comprehensive date/time correction functionality with weekday rescheduling
Implemented dry-run mode and interactive confirmation for safety
Added extensive documentation with usage examples and default behavior explanations

Reviewed Changes

Copilot reviewed 2 out of 11 changed files in this pull request and generated 4 comments.

File	Description
`src/gitutils/_git-fix-date.sh`	New bash script implementing the git fix date command with time validation, rescheduling logic, and git filter-branch integration
`src/gitutils/README.md`	Added comprehensive documentation for the new git fix date feature including usage examples, options, and default behavior

Copilot · 2025-10-03T12:55:13Z

src/gitutils/_git-fix-date.sh

+# Validate time formats
+
+# Prevent running while a rebase is in progress
+if git isRebase >/dev/null 2>&1; then
+	zz_log e "A rebase is in progress. Please finish or abort it before running this script."
+	exit 1
+fi
+if ! echo "$start" | grep -qE '^[0-9]{2}:[0-9]{2}$'; then


The time format validation code is placed after the rebase check comment but before the actual validation logic begins. Move the time validation code (lines 47-62) to immediately follow the validation comment on line 40 for better code organization.

Copilot · 2025-10-03T12:55:14Z

src/gitutils/_git-fix-date.sh

+# Collect commits that need rescheduling
+git log --format="%H|%ai|%ci|%s" --reverse $commit_range | while IFS='|' read commit_sha author_date committer_date subject; do


The long git log pipeline creates a subshell that prevents the temp_map file from being populated in the parent shell. This will cause the filter-branch operation to fail. Consider using a different approach such as process substitution or writing to a temporary file within the loop.

src/gitutils/_git-fix-date.sh

src/gitutils/README.md

Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

…onfirmation prompt Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

…essary output

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

tomgrv · 2025-10-03T14:09:48Z

/rebase

* Initial plan * Initial plan for git fix date feature Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com> * Add git fix date script and documentation Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com> * Add default values and dry-run mode to git fix date Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com> * Change dry-run flag from -n to -d, days flag from -d to -r, and add confirmation prompt Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com> * fix(gitutils): 🐛 add rebase check and improve confirmation prompt * fix(gitutils): 🐛 update logging messages for clarity and remove unnecessary output * revert: remove unnecessary dependencies and clean up configuration files * Update src/gitutils/_git-fix-date.sh Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/gitutils/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI assigned Copilot and tomgrv Oct 3, 2025

Copilot started work on behalf of tomgrv October 3, 2025 10:55 View session

Copilot AI changed the title ~~[WIP] Git fix date~~ Add git fix date command to reschedule commit times while preserving sequential order Oct 3, 2025

Copilot AI requested a review from tomgrv October 3, 2025 11:11

Copilot finished work on behalf of tomgrv October 3, 2025 11:11

Copilot started work on behalf of tomgrv October 3, 2025 11:55 View session

Copilot AI changed the title ~~Add git fix date command to reschedule commit times while preserving sequential order~~ Add git fix date command with default values and dry-run mode to reschedule commit times Oct 3, 2025

Copilot finished work on behalf of tomgrv October 3, 2025 12:02

Copilot started work on behalf of tomgrv October 3, 2025 12:22 View session

Copilot AI changed the title ~~Add git fix date command with default values and dry-run mode to reschedule commit times~~ Add git fix date command with default values, dry-run mode, and confirmation prompt to reschedule commit times Oct 3, 2025

Copilot finished work on behalf of tomgrv October 3, 2025 12:28

tomgrv changed the title ~~Add git fix date command with default values, dry-run mode, and confirmation prompt to reschedule commit times~~ feat(gitutils): add git fix date Oct 3, 2025

tomgrv marked this pull request as ready for review October 3, 2025 12:54

Copilot AI review requested due to automatic review settings October 3, 2025 12:54

tomgrv approved these changes Oct 3, 2025

View reviewed changes

Copilot AI reviewed Oct 3, 2025

View reviewed changes

tomgrv changed the title ~~feat(gitutils): add git fix date~~ feat(gitutils): add git fix date Oct 3, 2025

Copilot AI and others added 8 commits October 3, 2025 14:01

Initial plan

9bf07de

Initial plan for git fix date feature

d4c126d

Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

Add git fix date script and documentation

98bcef9

Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

Add default values and dry-run mode to git fix date

f09ade8

Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

Change dry-run flag from -n to -d, days flag from -d to -r, and add c…

1a95b43

…onfirmation prompt Co-authored-by: tomgrv <1809566+tomgrv@users.noreply.github.com>

fix(gitutils): 🐛 add rebase check and improve confirmation prompt

07a1fb8

fix(gitutils): 🐛 update logging messages for clarity and remove unnec…

38dea0b

…essary output

revert: remove unnecessary dependencies and clean up configuration files

eb01057

tomgrv and others added 2 commits October 3, 2025 14:01

Update src/gitutils/_git-fix-date.sh

19687a5

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/gitutils/README.md

fb8c083

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

tomgrv force-pushed the copilot/fix-b710fbbf-a2f1-4ae9-aec5-7e98a5362f5c branch from 25c998a to fb8c083 Compare October 3, 2025 14:02

tomgrv changed the base branch from main to develop October 3, 2025 14:06

tomgrv merged commit a896bd4 into develop Oct 3, 2025
2 checks passed

tomgrv deleted the copilot/fix-b710fbbf-a2f1-4ae9-aec5-7e98a5362f5c branch October 3, 2025 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(gitutils): add git fix date #28

feat(gitutils): add git fix date #28

Uh oh!

Copilot AI commented Oct 3, 2025 •

edited

Loading

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Copilot AI commented Oct 3, 2025

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Copilot AI commented Oct 3, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Oct 3, 2025

Uh oh!

Copilot AI Oct 3, 2025

Uh oh!

Uh oh!

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		# Collect commits that need rescheduling
		git log --format="%H\|%ai\|%ci\|%s" --reverse $commit_range \| while IFS='\|' read commit_sha author_date committer_date subject; do

feat(gitutils): add git fix date #28

feat(gitutils): add git fix date #28

Uh oh!

Conversation

Copilot AI commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Problem

Solution

Core Functionality

Default Values

Usage

Options

Example: Dry-Run Mode

Example: Apply with Confirmation

Example: Custom Parameters

Technical Implementation

Files Changed

Testing

Comments on the Issue (you are @copilot in this section)

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Copilot AI commented Oct 3, 2025

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Copilot AI commented Oct 3, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tomgrv commented Oct 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented Oct 3, 2025 •

edited

Loading