summaryrefslogtreecommitdiffstats
path: root/g
Commit message (Collapse)AuthorAgeFilesLines
* ./g: don't exit early on ./g checkout -fThorsten Behrens2018-07-021-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>
* ./g: indent & de-tabbify to make code readableThorsten Behrens2018-07-021-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>
* Revert "g: ignore submodule changes"Stephan Bergmann2018-03-121-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>
* tdf#105204: more ShellCheck nitpicks for gIlmari Lauhakangas2017-04-271-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>
* tdf#105204: ShellCheck nitpicks for gIlmari Lauhakangas2017-04-261-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>
* it is "git submodule", not "git submodules"Christian Lohmaier2016-05-171-1/+1
|
* g: fix var in checkoutJuergen Funk2016-01-081-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>
* 'g' doesn't work correctly when config_host.mk contains non-ascii characters.Tomofumi Yagi2015-06-181-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>
* g: SRC_ROOT may not contain path string in a localized environmentTomofumi Yagi2015-02-171-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>
* Some quoting fixesStephan Bergmann2015-01-141-6/+6
| | | | Change-Id: I3b375c67ed84f29360cbc9933f4a1e5c7cbe3277
* g: fix --set-push-urlsMiklos Vajna2013-10-041-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
* g: ignore submodule changesMiklos Vajna2013-07-221-0/+8
| | | | Change-Id: I6125dd018615bc7aa18bacc838ea602ccb0fabc1
* Reintroduce --with-linked-git optionLionel Elie Mamane2013-06-211-0/+9
| | | | | | | | With slightly different semantics: Instead of pointing at a previous checkout, point at base directory of all repos. Change-Id: I254ecc33071be53067c44610b030f737cf75a7ee
* g clone: fix non-referenced cloningMiklos Vajna2013-02-261-4/+6
| | | | Change-Id: I98d6f5c20bacbb5d6457857906c591fea034288a
* configure: add --with-referenced-git optionMiklos Vajna2013-02-091-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
* set-up the hooks for submodules for recent git setupNorbert Thiebaud2012-12-211-0/+17
| | | | Change-Id: I52482d017966e1d9671f92f43ec9d8cac6daf602
* ./g cannot reference builddirLuboš Luňák2012-12-111-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
* BUILD_DIR -> BUILDDIR, to be consistent with the other *DIRLuboš Luňák2012-12-111-4/+4
| | | | Change-Id: Ia80a1246a7e3c8862a50a3daf79aba5609b7df3a
* Prepare for read-only source buildNorbert Thiebaud2012-12-111-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>
* Fix --set-push-urls.Jan Holesovsky2012-11-231-4/+1
| | | | Change-Id: Ic3a424b5ac8c2168747bc7253f421bf5367beac7
* binfilter.die.die.dieNorbert Thiebaud2012-11-091-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>
* g: fix typoMiklos Vajna2012-10-181-1/+1
| | | | Change-Id: I97484d8647549646117f6c51dde4eb17ec82c8be
* cleanup ./g outputPeter Foley2012-10-161-2/+4
| | | | Change-Id: I84a775ceb983ad21d4585a3c3718f99bbac5a282
* missing fi in ./gNorbert Thiebaud2012-10-161-0/+1
| | | | Change-Id: Ic763d7cd73c2a3df8e5d5146eaf795188d8c79d1
* add tag support to ./g, try to optimize pre->post submerge situationNorbert Thiebaud2012-10-161-2/+34
| | | | Change-Id: I052817865da6df193c0451eccc3b8b6f507845a3
* when switching to a pre-submodule point, clean-up the soft-link pointNorbert Thiebaud2012-10-161-0/+11
| | | | Change-Id: I5a8f144bb4ad167cfa0e6763e3cf273b9127d65b
* submodules migrationNorbert Thiebaud2012-10-161-359/+228
| | | | Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
* Update ./g --set-push-user to work with gerrit.Jan Holesovsky2012-08-201-1/+1
| | | | Change-Id: If83b29222740e9d479d8b3c9b9d90ccc3706cd49
* suppress distracting message in ./g on some platformNorbert Thiebaud2012-07-211-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
* make ./g robust against missing bin/repo-list fileBjoern Michaelsen2012-07-101-2/+9
| | | | Change-Id: Ib61a679221d0eddea61358024d31c90464dccefb
* g push/status: use @{upstream} instead of originMiklos Vajna2012-03-131-2/+2
| | | | | origin won't work if origin/HEAD points to nowhere, which is a valid use-case.
* git rev-parse argument are not files, no need to try to find abs-pathNorbert Thiebaud2011-11-291-7/+12
| | | | This was causing some error message on Windows
* Added ./g -v switch to show git commands.Stephan Bergmann2011-11-291-0/+7
|
* 'g': whitespace: expand tabsMichael Stahl2011-11-041-78/+78
|
* 'g': actually set up git hooks properlyMichael Stahl2011-11-041-10/+14
|
* make --last-working checkout the last working versionMichael Meeks2011-10-311-1/+7
| | | | thanks to Bjoern and Christian for tips.
* 'g' tool: fix silly error in --set-last-workingMichael Meeks2011-10-271-1/+1
|
* initial cut at 'last working' feature to help windows buildersMichael Meeks2011-10-251-1/+25
|
* g: check if git is in PATHMiklos Vajna2011-09-051-0/+4
|
* remove debug-tracesNorbert Thiebaud2011-08-281-2/+0
|
* mishap in ./g, issue with links creationsNorbert Thiebaud2011-08-281-2/+4
|
* add ./g -z to just refresh the hooks and possibly other housekeepingNorbert Thiebaud2011-08-271-5/+10
|
* use translations' own hooks. update the hooks after the clone/fetch/pullNorbert Thiebaud2011-08-271-35/+88
|
* bootstrap is now core in ./gNorbert Thiebaud2011-08-061-3/+3
|
* we don't need the repos_changed semaphore file anymoreNorbert Thiebaud2011-06-041-7/+0
| | | | | | | | | | ./g was doing 2 pair of git show-ref --head HEAD to figure out if something had change... notwidthstanding that it is a complete waste for the case of ./g clone, the only reason this was done was to touch a ./clone/repos_changed file that used to be used back in the 'build repo' days (pre 3.4) binned that.
* Don't print === decoration when running g grepChristian Dywan2011-05-181-1/+1
| | | | Otherwise g grep -l can't be used, for example with sed.
* Dont print misleading informationTor Lillqvist2011-05-061-1/+1
|
* add an option to ./g to have a compact <repo>:<value> outputNorbert Thiebaud2011-05-011-7/+17
| | | | | This is usefull to collect the heads of the repos in a easily parsable format
* use git hook instead of gitattributes filter for *.po filesAndras Timar2011-04-271-6/+0
|
* set .gitattributes filter for *.po filesAndras Timar2011-03-231-0/+6
|