git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-gui: missing some patches from git?

From
Pratyush Yadav <me@yadavpratyush.com>
Date
Sep 24, 2019, 14:06 UTC
Message-ID
<20190924140645.k62dkndxy3z5fxke@yadavpratyush.com>
In-Reply-To
<20190919191105.GA85790@dentonliu-ltm.internal.salesforce.com>
On 19/09/19 12:11PM, Denton Liu wrote:
Show 31 quoted lines
> On Fri, Sep 20, 2019 at 12:33:59AM +0530, Pratyush Yadav wrote:
> > On 19/09/19 11:47AM, Denton Liu wrote:
> > > For the record, you could do a
> > > 
> > > 	git cherry-pick -Xsubtree=git-gui 00ddc9d13c 7560f547e6
> > > 
> > > to bring them over instead of manually recreating the changes yourself.
> > > Personally, I'd prefer the cherry-picked commits as it'd preserve
> > > authorship information but I'm not sure how Junio feels.
> > 
> > I'm not sure how this will work internally, but won't this also pull all 
> > the ancestors of those commits into git-gui? That is bloat I'd rather 
> > avoid.
> > 
> > I tried creating branches for those two commits and then did a subtree 
> 
> Since those two commits have parents that are found in git.git, you'll
> pull the whole history of git.git if you try doing this.
> 
> > pull, and that is what happened. The repo size went up from around 6M to 
> > 72M. Will cherry-picking avoid that?
> > 
> 
> Yes, when you cherry-pick, you're essentially replaying the patch from
> the old tree onto the new tree and recording a fresh commit from it. The
> new commit is completely separate from the one it's based on so you
> won't end up pulling in any ancestry information and, as a result, you
> won't pull the rest of git's history.
> 
> In any case, give it a try. It doesn't hurt to experiment and play
> around with it.
It works. Thanks.
-- 
Regards,
Pratyush Yadav
Previous: Denton LiuNext: Junio C Hamano
Message 12 of 13 in “git-gui: missing some patches from git?”
  1. Birger Skogeng PedersenSep 18, 2019
  2. Denton LiuSep 18, 2019
  3. Pratyush YadavSep 18, 2019
  4. Denton LiuSep 18, 2019
  5. Junio C HamanoSep 18, 2019
  6. Pratyush YadavSep 18, 2019
  7. Pratyush YadavSep 19, 2019
  8. Denton LiuSep 19, 2019
  9. Pratyush YadavSep 19, 2019
  10. Denton LiuSep 19, 2019
  11. Denton LiuSep 19, 2019
  12. Pratyush YadavSep 24, 2019
  13. Junio C HamanoSep 18, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.