summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Drop committer info from git tag environment; update tag test outputsJannis Pohlmann2012-12-178-28/+30
* Merge branch 'jannispohlmann/cache-resolved-refs-and-morphologies'Jannis Pohlmann2012-12-141-4/+18
|\
| * Cache resolved refs and morphologies when traversing morphsJannis Pohlmann2012-12-131-4/+18
* | Merge remote-tracking branch 'remotes/origin/samthursfield/ambiguous-refs' in...Jannis Pohlmann2012-12-137-56/+79
|\ \
| * | morph branch: Check if the ref already exists before anything elseSam Thursfield2012-12-133-6/+20
| * | Add a test to catch any future use of git show-refSam Thursfield2012-12-131-0/+32
| * | Always use `git rev-parse --verify` to resolve refsSam Thursfield2012-12-136-50/+27
| |/
* | Fix morph tag usage of git commit-tree; fix detecting existing tagsJannis Pohlmann2012-12-131-12/+23
* | Fix bashism in morph tag test scriptsJannis Pohlmann2012-12-134-4/+4
* | Merge remote-tracking branch 'origin/jannispohlmann/morph-tag-v2'Sam Thursfield2012-12-1311-0/+746
|\ \ | |/ |/|
| * Add an initial implementation of "morph tag"Jannis Pohlmann2012-12-1311-0/+746
|/
* Merge branch 'jonathanmaw/find-artifacts-rebase' of ssh://trove.baserock.org/...Richard Maw2012-12-101-0/+123
|\
| * Add find-artifacts scriptJonathan Maw2012-12-101-0/+123
* | Merge branch 'jonathanmaw/cache-key-less-rigorous'Sam Thursfield2012-12-072-0/+49
|\ \
| * | Avoid rebuilds when unimportant morphology contents changeJonathan Maw2012-11-292-0/+49
* | | Merge branch 'baserock/richardmaw/build-less-artifacts'Richard Maw2012-12-032-4/+19
|\ \ \ | |_|/ |/| |
| * | Test source pool having duplicates addedRichard Maw2012-12-031-0/+9
| * | Ensure sourcepool does not contain duplicatesRichard Maw2012-12-031-2/+3
| * | Amend test to not add the same source to the pool twiceRichard Maw2012-12-031-2/+7
|/ /
* | Revert "Merge branch 'liw/hardlink-staging-area-pre-rebase'"Jannis Pohlmann2012-11-303-89/+33
|/
* Merge branch 'liw/hardlink-staging-area-pre-rebase'Lars Wirzenius2012-11-293-33/+89
|\
| * Change method comments to docstringsLars Wirzenius2012-11-291-3/+6
| * Use the builder runcmd, to get build environment rightLars Wirzenius2012-11-291-6/+4
| * Reformat code, plus adapt for non-staging-area buildsLars Wirzenius2012-11-292-16/+22
| * Refactor and fix to make it pass (more of) the test suiteLars Wirzenius2012-11-292-10/+29
| * Hardlinked chroot done with linux-user-chrootJoe Burmeister2012-11-292-34/+64
|/
* Fix line longer than 79 charsSam Thursfield2012-11-261-1/+1
* Fix another baserock: URLLars Wirzenius2012-11-211-1/+1
* Fix URLs in example in READMELars Wirzenius2012-11-211-2/+2
* Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2012-11-211-1/+2
|\
| * Merge branch 'samthursfield/remove-gzip-file-header'Sam Thursfield2012-11-161-1/+2
| |\
| | * Don't store original filename in compressed image filesSam Thursfield2012-11-161-1/+2
| |/
* | Fix baserock: aliased URLs to point at new locationLars Wirzenius2012-11-211-6/+6
|/
* Merge branch 'samthursfield/handle-target-disk-full' of git://git.baserock.or...Richard Maw2012-11-155-25/+101
|\
| * Cleanly handle out of disk space on target filesystem.Sam Thursfield2012-11-154-1/+60
| * Override Python tarfile module to close file handles on exceptionSam Thursfield2012-11-151-0/+15
| * Close file handles correctly on exceptions when unpacking strataSam Thursfield2012-11-152-23/+25
| * Consistency fixSam Thursfield2012-11-151-1/+1
|/
* Merge branch 'samthursfield/test-tidying-3' of git://git.baserock.org/baseroc...Richard Maw2012-11-1514-307/+77
|\
| * Update as-root tests to use their setup infrastructureSam Thursfield2012-11-1414-307/+77
* | Merge branch 'samthursfield/test-tidying-2' of git://git.baserock.org/baseroc...Richard Maw2012-11-1585-285/+366
|\ \ | |/
| * Tidy up command testsSam Thursfield2012-11-1485-285/+366
|/
* Merge branch 'baserock/richardmaw/fix-python-check'Sam Thursfield2012-11-1319-90/+56
|\
| * Consolidate checks for python versionRichard Maw2012-11-1319-90/+56
* | Revert "Merge remote-tracking branch 'origin/jonathanmaw/autotools-sysconfdir'"water-bombSam Thursfield2012-11-131-1/+1
|/
* Merge branch 'samthursfield/build-without-push' of git://git.baserock.org/bas...Richard Maw2012-11-1225-116/+225
|\
| * Avoid caching repos that are on the local machine anywaySam Thursfield2012-11-1211-16/+30
| * Use git://localhost URL's instead of file:// in update-gits testsSam Thursfield2012-11-123-22/+48
| * morph build: Allow forcing build branches to be pushedSam Thursfield2012-11-124-4/+49
| * Add 'morph build' test with strata outside the root repoSam Thursfield2012-11-121-0/+62