public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Arsh Srivastava via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Phillip Wood <phillip.wood123@gmail.com>,
	 Arsh Srivastava <arshsrivastava00@gmail.com>,
	 Patrick Steinhardt <ps@pks.im>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH v5 0/3] Advice on checkout dirty files
Date: Wed, 11 Mar 2026 18:02:40 -0700	[thread overview]
Message-ID: <xmqqjyvhkggf.fsf@gitster.g> (raw)
In-Reply-To: <pull.2233.v5.git.git.1773251369.gitgitgadget@gmail.com> (Arsh Srivastava via GitGitGadget's message of "Wed, 11 Mar 2026 17:49:26 +0000")

"Arsh Srivastava via GitGitGadget" <gitgitgadget@gmail.com> writes:

> Changes:
>
>> advice.h: add ADVICE_STASH_BEFORE_CHECKOUT enum value advice.c: add
>> "stashBeforeCheckout" to advice_setting[] and implement
>> advise_on_checkout_dirty_files() function
>> Documentation/config/advice.adoc: document the new advice key
>
> Signed-off-by: Arsh Srivastava arshsrivastava00@gmail.com
>
> Arsh Srivastava (3):
>   advice: add stashBeforeCheckout advice for dirty branch switches
>   advice: add stashBeforeCheckout advice for dirty branch switches
>     [GSOC]
>   unpack-trees: suggesting 'git checkout -m <branch>' with its
>     repercussions

I still see that [PATCH 3/3] literally removes what was added by
earlier patches.  ADVICE_STASH_BEFORE_CHECKOUT is added to
advice.[ch] and stashBeforeCheckOut is added to
Documentation/config/adivce.adoc in [1/3], and then they are removed
in [3/3].  If your final solution does not involve such an advice,
then do not even add it in an earlier patch, only to retract it and
replace it with something else in a later patch.  If the reason why
that "something else" replaces the advice is because it is a better
solution to the problem you initially started to solve than the
advice message added in [1/3], then just go straight to that
"something else", without adding and removing the advice mechanism.

That is what "perfect logical progression without detours, change of
plans, and fixes earlier mistake" is about.

In other words, please do not throw a drunken-man's-walk series at
us.  Pretend to be a perfect developer.

The final series accepted by the project will have to stay in our
history for later developers to see in "git log" output to learn
from, and a series being clean logical progression is a must for
that to happen.


  parent reply	other threads:[~2026-03-12  1:02 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-10  8:51 [PATCH 0/5] Advice on checkout dirty files Arsh Srivastava via GitGitGadget
2026-03-10  8:51 ` [PATCH 1/5] diff: handle ANSI escape codes in prefix when calculating diffstat width LorenzoPegorari via GitGitGadget
2026-03-10  8:51 ` [PATCH 2/5] t4052: test for diffstat width when prefix contains ANSI escape codes LorenzoPegorari via GitGitGadget
2026-03-10  8:51 ` [PATCH 3/5] repo: remove unnecessary variable shadow K Jayatheerth via GitGitGadget
2026-03-10  8:51 ` [PATCH 4/5] The 13th batch Junio C Hamano via GitGitGadget
2026-03-10  8:51 ` [PATCH 5/5] advice: add stashBeforeCheckout advice for dirty branch switches Arsh Srivastava via GitGitGadget
2026-03-10 10:33 ` [PATCH 0/5] Advice on checkout dirty files Phillip Wood
2026-03-10 10:42   ` Arsh Srivastava
2026-03-10 10:45     ` Arsh Srivastava
2026-03-10 13:36   ` Junio C Hamano
2026-03-10 13:40     ` Arsh Srivastava
2026-03-10 15:40       ` Junio C Hamano
2026-03-10 16:05         ` Arsh Srivastava
2026-03-10 16:08         ` Arsh Srivastava
2026-03-10 10:59 ` [PATCH v2] advice: add stashBeforeCheckout advice for dirty branch switches Arsh Srivastava via GitGitGadget
     [not found]   ` <CAOAgETOebObfZNWA5LWMDxYv8YXYpbrb9L3_ASs_AbQjiQZYZw@mail.gmail.com>
2026-03-10 11:04     ` Arsh Srivastava
2026-03-10 13:16   ` Patrick Steinhardt
2026-03-10 13:36     ` Arsh Srivastava
2026-03-10 14:24       ` Patrick Steinhardt
2026-03-10 13:28   ` [PATCH v3 0/2] Advice on checkout dirty files Arsh Srivastava via GitGitGadget
2026-03-10 13:28     ` [PATCH v3 1/2] advice: add stashBeforeCheckout advice for dirty branch switches Arsh Srivastava via GitGitGadget
2026-03-10 13:43       ` Arsh Srivastava
2026-03-10 13:28     ` [PATCH v3 2/2] advice: add stashBeforeCheckout advice for dirty branch switches [GSOC] Arsh Srivastava via GitGitGadget
2026-03-11  8:50     ` [PATCH v4 0/5] Advice on checkout dirty files Arsh Srivastava via GitGitGadget
2026-03-11  8:50       ` [PATCH v4 1/5] advice: add stashBeforeCheckout advice for dirty branch switches Arsh Srivastava via GitGitGadget
2026-03-11  8:50       ` [PATCH v4 2/5] advice: add stashBeforeCheckout advice for dirty branch switches [GSOC] Arsh Srivastava via GitGitGadget
2026-03-11  8:50       ` [PATCH v4 3/5] unpack-trees: suggesting 'git checkout -m <branch>' with its repercussions Arsh Srivastava via GitGitGadget
2026-03-11  8:50       ` [PATCH v4 4/5] Updating tests and unpack-tress.c [GSOC] Arsh Srivastava via GitGitGadget
2026-03-11  8:50       ` [PATCH v4 5/5] File updation [GSOC] Arsh Srivastava via GitGitGadget
2026-03-11 16:38       ` [PATCH v4 0/5] Advice on checkout dirty files Junio C Hamano
2026-03-11 17:06         ` Arsh Srivastava
2026-03-11 17:49       ` [PATCH v5 0/3] " Arsh Srivastava via GitGitGadget
2026-03-11 17:49         ` [PATCH v5 1/3] advice: add stashBeforeCheckout advice for dirty branch switches Arsh Srivastava via GitGitGadget
2026-03-11 17:49         ` [PATCH v5 2/3] advice: add stashBeforeCheckout advice for dirty branch switches [GSOC] Arsh Srivastava via GitGitGadget
2026-03-11 17:49         ` [PATCH v5 3/3] unpack-trees: suggesting 'git checkout -m <branch>' with its repercussions Arsh Srivastava via GitGitGadget
2026-03-12  1:02         ` Junio C Hamano [this message]
2026-03-12  3:32           ` [PATCH v5 0/3] Advice on checkout dirty files Arsh Srivastava
2026-03-12  4:00         ` [PATCH v6] unpack-trees: suggesting 'git checkout -m' with its repercussions Arsh Srivastava via GitGitGadget
2026-03-12 16:06           ` Junio C Hamano
2026-03-12 18:13             ` Arsh Srivastava
2026-03-12 18:56               ` Junio C Hamano
2026-03-12 19:03                 ` Arsh Srivastava
2026-03-12 19:07                   ` Junio C Hamano
2026-03-12 19:12                     ` Arsh Srivastava
2026-03-12 20:05           ` [PATCH v7] unpack-trees: suggest using 'git stash' when checkout fails Arsh Srivastava via GitGitGadget
2026-03-12 22:40             ` Junio C Hamano
2026-03-13  3:13               ` Arsh Srivastava
2026-03-13 10:43                 ` Karthik Nayak
2026-03-13 11:02                   ` Arsh Srivastava
2026-03-13 22:05                   ` Junio C Hamano
2026-03-13 10:49                 ` Arsh Srivastava
2026-03-13 11:04                 ` Arsh Srivastava
2026-03-10 14:31   ` [PATCH v2] advice: add stashBeforeCheckout advice for dirty branch switches Karthik Nayak
2026-03-10 14:37     ` Arsh Srivastava
2026-03-10 14:40       ` Arsh Srivastava
2026-03-10 17:15         ` Karthik Nayak
2026-03-10 18:00           ` Arsh Srivastava
2026-03-10 14:41       ` Arsh Srivastava
2026-03-10 16:48       ` Junio C Hamano
2026-03-10 17:09         ` Karthik Nayak
2026-03-14  4:27           ` Konstantin Ryabitsev
2026-03-10 17:56         ` Arsh Srivastava

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=xmqqjyvhkggf.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=arshsrivastava00@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=karthik.188@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=ps@pks.im \
    /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