summaryrefslogtreecommitdiff
path: root/g
AgeCommit message (Collapse)AuthorFilesLines
2023-04-01git-hooks: remove hint in './g -z'Juergen Funk1-4/+0
In the patch 05ea4ac1952c546a81781ac0662747dbe6073616 the hint is too mutch and the elsewhere I think it makes no sense, remove. Change-Id: I1c13e593f673f2cab9a307f57f59efa1fbd903c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149761 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-03-22Fix typoAndrea Gelmini1-1/+1
Change-Id: I65261e7aaccb640eee4100fd53bc7e7e2cb229f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149318 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2023-03-22git-hooks: better handling in './g -z' with win-linksJuergen Funk1-33/+49
and linux-links This patch improve patch 9afc6b22e225e8a6ec50c1cbb4d966585d15dbfd git-hooks: overwrite the windows-links not with linux-links The main problem with the previous patch is that when an alias is set for git, this alias will not map in the Shell script passed, better you use a git-symlink. The other problem was the behavior of cygwin-bash and win-git-bash that is not always the same, e.g. - winlnk=$(cmd /C ... 2>&1) it hang infinity, line 123 - the 'ln' made not link, it only copy the files Improving the FOR in ./git-hooks/README, when you have the copied files, need a other del command The patch can not set the windows-links, only output the ./git-hooks/README But in Win 11 should be possible, it is not needed admin-rights for the 'mklink' command Change-Id: Icecdb96e65fe2bba1270dfad2ac1af5af145925a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148462 Tested-by: Jenkins Reviewed-by: Juergen Funk <juergen.funk_ml@cib.de>
2023-03-01git-hooks: overwrite the windows-links not with linux-linksJuergen Funk1-16/+48
Always when you call build or logerrit, then the windows-links overwrite with linux-links, but when you using GIT for Windows you need the windows-links. This patch made a check it is using GIT for Windows, and check what for link it is, when wrong link, it output the .git-hooks/README Improve the check for links, when a link is set not need to set the link anymore In .git-hooks/README improve the FOR with delete of the wrong link look here for GIT for Windows: https://wiki.documentfoundation.org/Development/BuildingOnWindows/de#Cygwin_and_git Change-Id: I9f6ef9aca316058ef74cb2b2d107236f03a2e2ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147458 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-11-28Avoid refreshing all hooks in secondary worktreesMike Kaganski1-7/+10
This avoids "ln: failed to access '.git/hooks/foo': Not a directory" console noise. The primary worktree's hooks are used in secondary worktrees anyway. Possibly using 'git rev-parse --git-dir', and putting hooks there would be a better fix? No idea. Change-Id: I846e065d017744e9d8dcee847d48bc1adc66d761 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143358 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-05-31g: we are not, in fact, in the BUILDDIRMichael Stahl1-9/+9
For an out-of-tree build, "make fetch" poinlessly clones all git submodules. Change-Id: If4afb218946f49ba934f68b35806fd8143c39387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-01-15Allow g to run git gc commandArnaud VERSINI1-1/+4
Change-Id: Ibca338cbd99839b20a2373075a2e544e7ab638e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127870 Tested-by: Jenkins Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
2021-07-12Add "--progress" agument to the ./g commandKevin Suo1-6/+6
Newer version of git has a --progress option to show the progress when running "git submodule update". This is useful in our ./g command expecially when we are building the code with l10n languages enabled and the network connection is slow. Without this I do not see where I am for the update process and may think it have died. Change-Id: I4c9e1e9bccbd8e6ca2ea2b44f5b6d6d90cad1506 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117922 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-03-04Workaround a problem in Git for Windows' bashMike Kaganski1-0/+12
... where running './g pull -r' resulted in ln: failed to create symbolic link '.git/modules/dictionaries/hooks/*': No such file or directory ln: failed to create symbolic link '.git/modules/translations/hooks/*': No such file or directory Change-Id: Ie0bd2eaca44f8b1a2ad2de9083bbefc779e213e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111948 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-07-02./g: don't exit early on ./g checkout -fThorsten Behrens1-1/+1
Change-Id: I33f54c365bce64ccccfeb1c58fc8e4faddb7ad77 Reviewed-on: https://gerrit.libreoffice.org/56822 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-07-02./g: indent & de-tabbify to make code readableThorsten Behrens1-142/+142
Change-Id: Ica2a0dd281f77bfab223fa1526ba0720c9c280f1 Reviewed-on: https://gerrit.libreoffice.org/56821 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-12Revert "g: ignore submodule changes"Stephan Bergmann1-8/+0
This reverts commit 27925032cd5aec8805185679e01c687c40bbd617. Conflicts: g According to vmiklos, that commit was meant to help with the following scenario: Assume a dev uses submodules and uses plain `git pull && git submodule update` instead of ./g. When they forget the "&& git submodule update" part and do `git commit -a`, changes to the submodules were excluded from the commit. However, when they do `git add -u && git commit` instead of `git commit -a`, changes to the submodules /are/ included in the commit, despite `git status` or `git diff` (both prior to `git add -u`) or `git diff --cached` (after `git add -u`) not indicating that there are any changes to the submodules. I consider that problem more confusing and severe than the problem that the commit solved. Change-Id: I595eed3c1c04efd108be1ccd792d8d7bce72a345 Reviewed-on: https://gerrit.libreoffice.org/51155 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-27tdf#105204: more ShellCheck nitpicks for gIlmari Lauhakangas1-24/+24
Change-Id: I50cb1a403d3aa34434e61a2a995ef043b2f1f82c SC2086: Double quote to prevent globbing and word splitting. SC2145: Argument mixes string and array. Use * or separate argument. Reviewed-on: https://gerrit.libreoffice.org/37023 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-26tdf#105204: ShellCheck nitpicks for gIlmari Lauhakangas1-26/+26
Change-Id: I1814bc65c62af1a92a090127f1cfda8ad228936d SC2002: Useless cat. SC2045: Iterating over ls output is fragile. SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. SC2006: Use $(..) instead of legacy `..` Reviewed-on: https://gerrit.libreoffice.org/36571 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-05-17it is "git submodule", not "git submodules"Christian Lohmaier1-1/+1
2016-01-08g: fix var in checkoutJuergen Funk1-1/+1
Change-Id: Ie414037671ca9248931a47000db2b4ed259e72da Reviewed-on: https://gerrit.libreoffice.org/21217 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-06-18'g' doesn't work correctly when config_host.mk contains non-ascii characters.Tomofumi Yagi1-3/+3
In 'g' shell script, we use grep to get substring from config_host.mk file. When config_host.mk file contains non-ascii characters(e.g. Japanese), this processing doesn't work. As a result, some variables(SUBMODULES_CONFIGURED, REFERENCED_GIT, LINKED_GIT) will be assigned to "Binary file (standard input) matches". This is an error message of grep. The problem will reproduce on Cygwin64 with Japanese locale. With '-a' option, grep will work well, and 'g' shell script will work correctly. Please refer the following commit,too. http://cgit.freedesktop.org/libreoffice/core/commit/?id=0293ec98c92fd58a592f7dd86fbbf47e7b9195c6 Change-Id: If4e0b356173c8f442e3539ed343f441d87dbfd48 Reviewed-on: https://gerrit.libreoffice.org/16344 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-17g: SRC_ROOT may not contain path string in a localized environmentTomofumi Yagi1-1/+1
When config_host.mk contains non-ascii characters(e.g. Japanese ), SRC_ROOT may contain an error message "Binary file (standard input) matches") from grep, and SRC_ROOT may not contain path string. With '-a' option, grep will work well. Change-Id: Ifaada5f5a11939d624460cd8dcc57d93911ae790 Reviewed-on: https://gerrit.libreoffice.org/14491 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-14Some quoting fixesStephan Bergmann1-6/+6
Change-Id: I3b375c67ed84f29360cbc9933f4a1e5c7cbe3277
2013-10-04g: fix --set-push-urlsMiklos Vajna1-3/+3
1) submodule's .git is possibly a file now 2) just use the logerrit alias, as - logerrit setup already set that up - possibly otherwise the right ssh key is not picked up Change-Id: I4fb355a7f7ec7d549d2b06367f4fd10d06086374
2013-07-22g: ignore submodule changesMiklos Vajna1-0/+8
Change-Id: I6125dd018615bc7aa18bacc838ea602ccb0fabc1
2013-06-21Reintroduce --with-linked-git optionLionel Elie Mamane1-0/+9
With slightly different semantics: Instead of pointing at a previous checkout, point at base directory of all repos. Change-Id: I254ecc33071be53067c44610b030f737cf75a7ee
2013-02-26g clone: fix non-referenced cloningMiklos Vajna1-4/+6
Change-Id: I98d6f5c20bacbb5d6457857906c591fea034288a Notes: test note
2013-02-09configure: add --with-referenced-git optionMiklos Vajna1-1/+15
This is similar to --with-linked-git, but: 1) It uses git submodule update --reference, so it works with submodules. 2) The created repo is a true git repo, except that its object database reuses the referenced repo's objects, so it's a real speedup when e.g. translations are enabled. I intentionally didn't just fixed --with-linked-git, to make it clear this is more like git clone --reference, not git-new-workdir. Change-Id: I7c9584bce3670fd1e175b90aded2435cfe78056d
2012-12-21set-up the hooks for submodules for recent git setupNorbert Thiebaud1-0/+17
Change-Id: I52482d017966e1d9671f92f43ec9d8cac6daf602
2012-12-11./g cannot reference builddirLuboš Luňák1-3/+3
Because either it's called from there, and then it's the current directory, or otherwise the srcdir has no idea where the builddir is (or even how many of them), and there's nothing to tell it. Change-Id: I88c5fe8f015cc63a5aa7c327eb82ed751c3e8aa0
2012-12-11BUILD_DIR -> BUILDDIR, to be consistent with the other *DIRLuboš Luňák1-4/+4
Change-Id: Ia80a1246a7e3c8862a50a3daf79aba5609b7df3a
2012-12-11Prepare for read-only source buildNorbert Thiebaud1-3/+10
This patch allows to do mkdir <build_dir> cd <build_dir> <src_root>/autogen.sh make Only the remaining dmake modules are poluting the <src_root>... which will get eventually convererd to gmake... Change-Id: Iefd64732fa12e096d554cff4eee6b777deb92338 Reviewed-on: https://gerrit.libreoffice.org/1273 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-11-23Fix --set-push-urls.Jan Holesovsky1-4/+1
Change-Id: Ic3a424b5ac8c2168747bc7253f421bf5367beac7
2012-11-09binfilter.die.die.dieNorbert Thiebaud1-1/+1
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3 Reviewed-on: https://gerrit.libreoffice.org/1014 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-10-18g: fix typoMiklos Vajna1-1/+1
Change-Id: I97484d8647549646117f6c51dde4eb17ec82c8be
2012-10-16cleanup ./g outputPeter Foley1-2/+4
Change-Id: I84a775ceb983ad21d4585a3c3718f99bbac5a282
2012-10-16missing fi in ./gNorbert Thiebaud1-0/+1
Change-Id: Ic763d7cd73c2a3df8e5d5146eaf795188d8c79d1
2012-10-16add tag support to ./g, try to optimize pre->post submerge situationNorbert Thiebaud1-2/+34
Change-Id: I052817865da6df193c0451eccc3b8b6f507845a3
2012-10-16when switching to a pre-submodule point, clean-up the soft-link pointNorbert Thiebaud1-0/+11
Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
2012-10-16submodules migrationNorbert Thiebaud1-359/+228
Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
2012-08-20Update ./g --set-push-user to work with gerrit.Jan Holesovsky1-1/+1
Change-Id: If83b29222740e9d479d8b3c9b9d90ccc3706cd49
2012-07-21suppress distracting message in ./g on some platformNorbert Thiebaud1-1/+1
we use perl to determine the absolute path of argument thought to be fiels. but sometime they are not file at all and that call 'fail'. The code is meant to deal with such case, but on some platform that produce a scary message on stderr in the middle of the build log. This hide these messages. Change-Id: I52d43e0b26847ab091d76fd446a05c4d84836a77
2012-07-10make ./g robust against missing bin/repo-list fileBjoern Michaelsen1-2/+9
Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb
2012-03-13g push/status: use @{upstream} instead of originMiklos Vajna1-2/+2
origin won't work if origin/HEAD points to nowhere, which is a valid use-case.
2011-11-29git rev-parse argument are not files, no need to try to find abs-pathNorbert Thiebaud1-7/+12
This was causing some error message on Windows
2011-11-29Added ./g -v switch to show git commands.Stephan Bergmann1-0/+7
2011-11-04'g': whitespace: expand tabsMichael Stahl1-78/+78
2011-11-04'g': actually set up git hooks properlyMichael Stahl1-10/+14
2011-10-31make --last-working checkout the last working versionMichael Meeks1-1/+7
thanks to Bjoern and Christian for tips.
2011-10-27'g' tool: fix silly error in --set-last-workingMichael Meeks1-1/+1
2011-10-25initial cut at 'last working' feature to help windows buildersMichael Meeks1-1/+25
2011-09-05g: check if git is in PATHMiklos Vajna1-0/+4
2011-08-28remove debug-tracesNorbert Thiebaud1-2/+0
2011-08-28mishap in ./g, issue with links creationsNorbert Thiebaud1-2/+4
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 20:27:13 +0000