android/git-repo - git-repo - Gitea: Git with a cup of tea

android/git-repo

mirror of https://gerrit.googlesource.com/git-repo synced 2025-02-24 02:06:12 +00:00

Go to file

Florian Vallee 5d016502eb Fix switching manifest branches using repo init -b

See repo issue #46 :
	https://code.google.com/p/git-repo/issues/detail?id=46

When using repo init -b on an already existing repository,
the next sync will try to rebase changes coming from the old manifest
branch onto the new, leading in the best case scenario to conflicts
and in the worst case scenario to an incorrect "mixed up" manifest.

This patch fixes this by deleting the "default" branch in the local
manifest repository when the -d init switch is used, thus forcing
repo to perform a fresh checkout of the new manifest branch

Change-Id: I379e4875ec5357d8614d1197b6afbe58f9606751

2012-06-13 10:00:57 -07:00

ManifestXml: add include support

2012-05-24 09:07:24 -07:00

hooks/pre-auto-gc: look in sysfs to see if a battery is known.

2012-05-25 02:25:59 -07:00

Fix switching manifest branches using repo init -b

2012-06-13 10:00:57 -07:00

Fix error parsing a non-existant configuration file

2009-07-02 16:12:57 -07:00

.gitignore

.gitignore: add an entry for repopickles

2009-06-28 15:08:56 -07:00

.project

Add PyDev project files to repo

2009-06-02 00:09:07 +02:00

.pydevproject

Add PyDev project files to repo

2009-06-02 00:09:07 +02:00

color.py

Add -p to repo forall to improve output formatting

2009-04-18 13:49:13 -07:00

command.py

Treat groups= as default

2012-04-23 13:43:41 -07:00

COPYING

Initial Contribution

2008-10-21 07:00:00 -07:00

editor.py

Fix for handling values of EDITOR which contain a space.

2010-08-06 17:05:04 -07:00

error.py

Add manifest groups

2012-04-13 09:46:00 -07:00

git_command.py

Use GIT_CONFIG_PARAMETERS instead of -c for http.proxy

2012-06-05 15:11:15 -07:00

git_config.py

Permit - in URL schemes for special URLs

2012-03-14 15:28:22 -07:00

git_refs.py

Improve error handling when reading loose refs

2011-11-29 14:43:04 -08:00

git_ssh

Don't allow git fetch to start ControlMaster

2010-10-29 08:15:14 -07:00

main.py

Add support for Apache Digest authentication for repo init.

2012-03-14 15:01:34 -07:00

manifest_xml.py

Restore include support.

2012-06-07 20:19:04 -07:00

pager.py

Don't start the pager if stdout is a pipe

2009-04-01 07:24:22 -07:00

progress.py

Support units in progress messages

2011-09-19 14:52:57 -07:00

project.py

Fix switching manifest branches using repo init -b

2012-06-13 10:00:57 -07:00

repo

Use gerrit.googlesource.com/git-repo as the default URL

2012-06-05 07:57:24 -07:00

SUBMITTING_PATCHES

Update SUBMITTING_PATCHES

2012-02-28 18:54:33 -08:00

trace.py

Fix repo --trace to show ref and config loads

2009-04-18 09:54:51 -07:00