Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

newvers.sh: add support for gitup(1) #449

Closed
wants to merge 2 commits into from

Conversation

michael-o
Copy link
Contributor

gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit plus branch information along with other version information.

@michael-o
Copy link
Contributor Author

@emaste Here it is. Please have a look. This is how it looks for me:

# uname -a
FreeBSD bsd1srv.fritz.box 12.2-STABLE FreeBSD 12.2-STABLE 25e00a289 (stable/12) GENERIC  amd64
$ uname -a
FreeBSD bsd1srv.fritz.box 12.2-STABLE FreeBSD 12.2-STABLE 1c002413c ((detached)) GENERIC  amd64
$ uname -a
FreeBSD bsd1srv.fritz.box 12.2-STABLE FreeBSD 12.2-STABLE 6a45b9926 (stable/12) GENERIC  amd64

This is an upport to current. I use stable/12. I'd appreciate a backport to 12.

@michael-o
Copy link
Contributor Author

@emaste
Copy link
Member

emaste commented Jan 14, 2021

I'm currently blocked on johnmehr/gitup#36 for testing

@emaste
Copy link
Member

emaste commented Jan 16, 2021

#36 is now fixed

@uqs your take?

sys/conf/newvers.sh Outdated Show resolved Hide resolved
@emaste
Copy link
Member

emaste commented Jan 16, 2021

Here's what a stable/12 .gituprevision looks like in my tree

$ hexdump -Cv .gituprevision 
00000000  73 74 61 62 6c 65 2f 31  32 3a 62 37 39 31 62 35  |stable/12:b791b5|
00000010  37 36 33                                          |763|
00000013

gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit information only.
uqs pushed a commit that referenced this pull request Jan 20, 2021
gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit information only.

Submitted by:	Michael Osipov <michael.osipov@siemens.com>
Pull Request:	#449

While here, drop the redundant branch name from the git output and don't
count commits in shallow clones.

Reported by:	Michael Osipov <michael.osipov@siemens.com>
MFC after:	2 weeks
@michael-o
Copy link
Contributor Author

Everything has been merged. Thanks!

@michael-o michael-o closed this Jan 20, 2021
@michael-o michael-o deleted the gitup-support branch January 20, 2021 09:54
Copy link
Contributor

@markmi markmi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The git branch information is not redundant in my context of use and my local git branches now put the lines back in after the lines were removed from FreeBSD's main. (This does not deal with the lack of redundancy for pure FreeBSD branches in my context, unfortunately.)

@michael-o
Copy link
Contributor Author

The git branch information is not redundant in my context of use and my local git branches now put the lines back in after the lines were removed from FreeBSD's main. (This does not deal with the lack of redundancy for pure FreeBSD branches in my context, unfortunately.)

I advocated to have them, but committers thought otherwise.

@michael-o
Copy link
Contributor Author

The git branch information is not redundant in my context of use and my local git branches now put the lines back in after the lines were removed from FreeBSD's main. (This does not deal with the lack of redundancy for pure FreeBSD branches in my context, unfortunately.)

I would also like to point out that I created two distinct commits with proper messages. They were needlessly squashed into one.

brooksdavis pushed a commit to CTSRD-CHERI/cheribsd that referenced this pull request Oct 22, 2021
gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit information only.

Submitted by:	Michael Osipov <michael.osipov@siemens.com>
Pull Request:	freebsd/freebsd-src#449

While here, drop the redundant branch name from the git output and don't
count commits in shallow clones.

Reported by:	Michael Osipov <michael.osipov@siemens.com>
MFC after:	2 weeks
freebsd-git pushed a commit that referenced this pull request Sep 6, 2022
gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit information only.

Submitted by:	Michael Osipov <michael.osipov@siemens.com>
Pull Request:	#449

While here, drop the redundant branch name from the git output and don't
count commits in shallow clones.

Reported by:	Michael Osipov <michael.osipov@siemens.com>
MFC after:	2 weeks

PR:		252507

(cherry picked from commit a9fc14f)
hardenedbsd-services pushed a commit to HardenedBSD/hardenedBSD that referenced this pull request Feb 10, 2023
* Improve testing of memcpy including adding perf test.

* Change remaining_bytes to be branch free.

Use reciprocal division followed by multiply to remove a branch.
@emaste emaste added the merged label Jun 12, 2023
laffer1 pushed a commit to MidnightBSD/src that referenced this pull request Jun 26, 2023
gitup writes a .gituprevision file into the shallow clone directory. Read that
file and print commit information only.

Submitted by:	Michael Osipov <michael.osipov@siemens.com>
Pull Request:	freebsd/freebsd-src#449

While here, drop the redundant branch name from the git output and don't
count commits in shallow clones.

Reported by:	Michael Osipov <michael.osipov@siemens.com>
MFC after:	2 weeks

PR:		252507

(cherry picked from commit a9fc14fbf445cffd18f34f6a602bdba84bb5a867)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
5 participants