git update-index would fail on long command lines when setting up
a resolve. Instead of passing all the files names on the command line,
pass them through --stdin and a file handle.
BUG=598808
Review-Url: https://codereview.chromium.org/2067653002
git rev-parse --git-dir returns a relative path, e.g. ".git". This
should be resolved relative to the cwd of the git command instead of the
current working dir. The cwd of the git command is set to _parent_repo
(=the absolute path after resolving --parent_checkout), so use that.
TEST=The following completes without errors.
$ cd /tmp
$ git init somegitrepo
$ cd somegitrepo
$ git drover --branch [branch] --cherry-pick [hash] -v --dry-run --parent_checkout /path/to/src
$ cd /path/to/src
$ git drover --branch [branch] --cherry-pick [hash] -v --dry-run
Review URL: https://codereview.chromium.org/1640233002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298416 0039d316-1c4b-4281-b951-d872f2087c98
Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.
BUG=404755
Review URL: https://codereview.chromium.org/1397313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98
This uses the same trick as git-new-workdir to reuse an existing git
checkout without interfering with it. However, this makes it only usable
on platforms where os.symlink exists.
BUG=404755
Review URL: https://codereview.chromium.org/1342383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296920 0039d316-1c4b-4281-b951-d872f2087c98
agable
scottmg
rob@robwu.nl
sammc@chromium.org