git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Charvi Mendiratta <charvi077@gmail.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: git <git@vger.kernel.org>, Christian Couder <christian.couder@gmail.com>
Subject: Re: [Outreachy]: Help for Outreachy Application
Date: Tue, 27 Oct 2020 19:54:09 +0530	[thread overview]
Message-ID: <CAPSFM5fbZN0uv9SgB-d4SR53ZFw8cOkgFmUK-Gns+c=yAmcP1w@mail.gmail.com> (raw)
In-Reply-To: <6a2005e7-6b8b-2bf4-91fa-55feadd65897@gmail.com>

On Mon, 26 Oct 2020 at 16:06, Phillip Wood <phillip.wood123@gmail.com> wrote:
>
Hi Phillip,

> Hi Charvi
>
> On 25/10/2020 07:43, Charvi Mendiratta wrote:
> > Hi Everyone!
> >
> > It has been about more than two weeks, since I joined the mailing
> > list. Till now I have contributed to the microproject - "Modernize the
> > test script" [1] that is accepted by Junio. Also I would like to Thank
> > you all for the help and feedback on my first patch series. I learned a
> > lot about the git command itself, how to work in a community with the
> > mailing list and will try my best to get involved in the review
> > discussions.
> >
> > I have read the Outreachy projects and am interested in the project
> > "Improve droping and rewording commits in Git interactive rebase". I
> > spent some time understanding the project and have gone through its
> > detailed explanation in the issue[2].
>
> Thanks for your interest in the project
>

I apologize for late replies, as I thought to spend some more time in
understanding the project.

> > As mentioned that the first task is to implement --reword option in
> > 'git commit'. Regarding this, I am unable to understand how it will
> > work upon rebase --autosquash?
>
> The idea is that --autosquash will rearrange the todo list so that the
> reword! commits get squashed into the commits they reword (by changing
> 'pick' to 'fixup' or maybe a new command) and the message from the
> reword! commit is used for the new commit rather than the message from
> the original commit that we squash the reword! commit into.
>

Thanks for the detailed explanation, now I can easily co relate this with
--fixup / --squash.

> > and regarding the task to include --drop option. In issue[2] it's
> > clear to add this as an option in git revert but at the Outreachy page
> > in the Internship task section, it's mentioned to implement --drop
> > option in git reset. So, there is a bit of confusion regarding the
> > correct way to implement.
>
> Yes getting the user interface right for creating the drop commits will
> be part of the project I think.
>
> > I also looked into archives of the mailing list and found the
> > patches[3] submitted by Philip for --reword option in git commit and
> > need some more pointers about its status and how to start with its
> > code ?
> > Also, in the issue[2] as commented by Phillip regarding the patches[4]
> > that implements reword. I would like to know if I can start with that
> > mentioned work, if available.
>
> Whoever takes on this project is very welcome to use my patches as a
> starting point. The code in the patches is sound as far as I know and
> the I believe the test coverage is reasonable (though that would need to
> be checked). They are lacking any documentation and there has been a
> change to the way empty commits are handled by rebase since they were
> written so "rebase -i: always keep empty amend! commits" will need
> looking at and could probably be dropped.
>

Okay, I will note these points .

> We will also need to decide on the best UI for the --reword idea. My
> patches were developed a couple of years ago before I was aware of
> dscho's idea and so implement a slightly different UI to the one
> outlined in the github issue (they call 'reword!' 'amend!' instead). I'm
> not that keen on adding another option to `git commit` to create yet
> another flavor of fixup commit, we'll need to agree a way forward on that[1]
>

I agree that we need to look into options for creating reword! commit
and drop! commit and its integration with interactive rebase .

Also, considering this I think there can be two possibilities :

As mentioned by Junio [1] that we can extend the existing '--fixed <commit>'/
'--squash <commit>', to implement reword! commit as mentioned in the issue[2]
by Dscho . or as you have mentioned to change the semantics of
'git commit --fixup/squash".
And, if we consider the above then for drop! commit, I wonder if we
can implement
it in the same way as mentioned in issue [2] by adding the --drop
option to 'git revert'.

Secondly, as you have mentioned here [3], there could be a `rewrite` command
as a wrap of `rebase -i` . But regarding this, I want to once confirm
if this can be a
solution of this project or is it need to be done later on.

Please correct me if I am wrong.

Thanks and Regards,
Charvi

[1] https://lore.kernel.org/git/xmqqft77glhn.fsf@gitster.c.googlers.com/
[2] https://github.com/gitgitgadget/git/issues/259
[3] https://lore.kernel.org/git/95cc6fb2-d1bc-11de-febe-c2b5c78a6850@gmail.com/

> Best Wishes
>
> Phillip
>
> [1]
> https://lore.kernel.org/git/95cc6fb2-d1bc-11de-febe-c2b5c78a6850@gmail.com
>
> >
> > Thanks and Regards,
> > Charvi
> >
> > [1] https://public-inbox.org/git/20201021124823.2217-1-charvi077@gmail.com/
> > [2] https://github.com/gitgitgadget/git/issues/259
> > [3]
> > https://public-inbox.org/git/pull.736.git.1600695050.gitgitgadget@gmail.com/
> > [4] https://github.com/phillipwood/git/commits/wip/rebase-amend
> >
>

  reply	other threads:[~2020-10-27 14:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-25  7:43 Charvi Mendiratta
2020-10-26 10:36 ` Phillip Wood
2020-10-27 14:24   ` Charvi Mendiratta [this message]
2020-10-27 17:48     ` Phillip Wood
2020-10-28 13:14       ` Charvi Mendiratta
2020-10-28 15:46         ` Phillip Wood

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='CAPSFM5fbZN0uv9SgB-d4SR53ZFw8cOkgFmUK-Gns+c=yAmcP1w@mail.gmail.com' \
    --to=charvi077@gmail.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood123@gmail.com \
    --subject='Re: [Outreachy]: Help for Outreachy Application' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox