From: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
To: Ahmad Gani <reyuki@gnuweeb.org>
Cc: Ammar Faizi <ammarfaizi2@gnuweeb.org>,
"GNU/Weeb Mailing List" <gwml@vger.gnuweeb.org>
Subject: Re: [PATCH gwproxy v4 5/6] dnsparser: Transaction id creation is delegated to caller
Date: Wed, 6 Aug 2025 17:51:31 +0700 [thread overview]
Message-ID: <CAOG64qP4KHQRDBvYMooJ2j7uP6De5Q-dX6UbN7W-bu-jS1v5=Q@mail.gmail.com> (raw)
In-Reply-To: <CAADvAgoK4jJZs77Z+oRAqCv80STxWk-HbEOdgqTSXZES3_ybtg@mail.gmail.com>
On Wed, Aug 6, 2025 at 5:21 PM Ahmad Gani wrote:
> Err.. How do you usually clean up commits like this? I accidentally amended
> the changes to the current commit, and splitting it manually without a diff
> seems like a nightmare. Is there a way to make splitting a patch easier?
What do you mean by "splitting it manually without a diff"?
I don't understand the exact activity you meant.
This splitting problem is because you didn't do it in the first place.
I don't often do that.
You can unstage the unrelated hunk, then amend a previous commit to
apply the same changes where that hunk should be applied.
That's just one hunk specific to variable reordering, it should not be
a problem. If you had a large chunk, you could copy the hunk and apply
it using "git apply" anw.
But this one is not a nightmare, this is just one line change.
And even If you lost the change due to a mistake in performing "git
commit --amend", you can still fetch the old changes from git reflog.
And even if your git reflog is fully destroyed, you still have the
patches you sent via email that can be reapplied, resulting in the
same git history, just that with different SHA1 hashes.
-- Viro
next prev parent reply other threads:[~2025-08-06 10:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-06 3:57 [PATCH gwproxy v4 0/6] Initial work for DNS lookup implementation Ahmad Gani
2025-08-06 3:57 ` [PATCH gwproxy v4 1/6] dnslookup: Split common functionality and struct into net.h and net.c Ahmad Gani
2025-08-06 6:18 ` Alviro Iskandar Setiawan
2025-08-06 3:57 ` [PATCH gwproxy v4 2/6] dnslookup: Add a new parameter default_port Ahmad Gani
2025-08-06 6:20 ` Alviro Iskandar Setiawan
2025-08-06 3:57 ` [PATCH gwproxy v4 3/6] dnslookup: Allow only port string number Ahmad Gani
2025-08-06 3:57 ` [PATCH gwproxy v4 4/6] dnslookup: Initial work for implementation of C-ares-like getaddrinfo function Ahmad Gani
2025-08-06 6:40 ` Alviro Iskandar Setiawan
2025-08-06 6:51 ` Alviro Iskandar Setiawan
2025-08-06 8:43 ` Ahmad Gani
2025-08-06 8:40 ` Ahmad Gani
2025-08-06 11:09 ` Alviro Iskandar Setiawan
2025-08-06 11:20 ` Alviro Iskandar Setiawan
2025-08-06 11:39 ` Ammar Faizi
2025-08-06 12:30 ` Ahmad Gani
2025-08-06 20:54 ` Ammar Faizi
2025-08-06 12:30 ` Ahmad Gani
2025-08-06 21:33 ` Ammar Faizi
2025-08-14 4:54 ` Ahmad Gani
2025-08-06 3:57 ` [PATCH gwproxy v4 5/6] dnsparser: Transaction id creation is delegated to caller Ahmad Gani
2025-08-06 6:28 ` Alviro Iskandar Setiawan
2025-08-06 10:20 ` Ahmad Gani
2025-08-06 10:51 ` Alviro Iskandar Setiawan [this message]
2025-08-06 12:29 ` Ahmad Gani
2025-08-06 3:57 ` [PATCH gwproxy v4 6/6] dnslookup: Make gw_ares_getaddrinfo asynchronous Ahmad Gani
2025-08-06 6:22 ` Alviro Iskandar Setiawan
2025-08-06 8:42 ` Ahmad Gani
2025-08-06 7:03 ` [PATCH gwproxy v4 0/6] Initial work for DNS lookup implementation Ammar Faizi
2025-08-06 7:08 ` Ammar Faizi
2025-08-06 8:37 ` Ahmad Gani
2025-08-06 8:58 ` Ammar Faizi
2025-08-06 9:47 ` Ammar Faizi
2025-08-06 20:50 ` Ammar Faizi
2025-08-06 22:14 ` Ammar Faizi
2025-08-06 7:08 ` (subset) " Ammar Faizi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOG64qP4KHQRDBvYMooJ2j7uP6De5Q-dX6UbN7W-bu-jS1v5=Q@mail.gmail.com' \
--to=alviro.iskandar@gnuweeb.org \
--cc=ammarfaizi2@gnuweeb.org \
--cc=gwml@vger.gnuweeb.org \
--cc=reyuki@gnuweeb.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox