Bug 568890

Summary:	sys-apps/portage-2.2.26: "emaint sync" ignoring "sync-depth = 1" for git pull?
Product:	Portage Development	Reporter:	Sebastian Pipping <sping>
Component:	Unclassified	Assignee:	Portage team <dev-portage>
Status:	RESOLVED DUPLICATE
Severity:	normal
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description Sebastian Pipping gentoo-dev

2015-12-20 16:57:12 UTC

Hi!

<man 5 portage> documents sync-depth to default to "1 (only the newest commit)".  Nevertheless, "emaint sync" seems to call "/usr/bin/git pull" without "--depth 1" while pull does support that option, too.  Is that intended or is that just left to do?

Thanks and best, Sebastian

Comment 1 Zac Medico gentoo-dev

2015-12-21 03:53:34 UTC

(In reply to Sebastian Pipping from comment #0)
> <man 5 portage> documents sync-depth to default to "1 (only the newest
> commit)".  Nevertheless, "emaint sync" seems to call "/usr/bin/git pull"
> without "--depth 1" while pull does support that option, too.  Is that
> intended or is that just left to do?

Have you ever tried doing a `git pull --depth=1` on the gentoo repo? I tried with git-2.4.10, and the default merge strategy reported conflicts for all of the updated Manifest files. However, `git fetch --depth=1` followed by `git reset --hard origin/master` works.

Comment 2 Zac Medico gentoo-dev

2015-12-21 04:10:08 UTC

(In reply to Zac Medico from comment #1)
> However, `git fetch --depth=1` followed by `git reset --hard origin/master` works.

Note that `git reset --hard origin/master` will reset all of the file timestamps, which will be an issue for people relying on the default flat_hash cache since it uses timestamps for cache validation. We should change it to use md5 like the cache that egencache generates (bug 568934 filed).

Comment 3 Sebastian Pipping gentoo-dev

2016-01-03 16:30:56 UTC

(In reply to Zac Medico from comment #1)
> Have you ever tried doing a `git pull --depth=1` on the gentoo repo? I tried
> with git-2.4.10, and the default merge strategy reported conflicts for all
> of the updated Manifest files.

I have seen it some time myself by now, yes.  I guess it's no option then.


> However, `git fetch --depth=1` followed by
> `git reset --hard origin/master` works.

It would keep more history though, if I am not mistaken.

Comment 4 Brian Dolbec (RETIRED) gentoo-dev

2016-01-03 16:58:58 UTC


*** This bug has been marked as a duplicate of bug 552814 ***