Issue 18966004: Default to using --3way when using `git cl patch` with git >= 1.7.12

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 18966004: Default to using --3way when using `git cl patch` with git >= 1.7.12 (Closed)

Created:
7 years, 5 months ago by tapted

Modified:
7 years, 5 months ago

Reviewers:
Isaac (away), M-A Ruel

CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Visibility:
Public.

More Reviews

Description

Default to using --3way when using `git cl patch` with git >= 1.7.12 Git introduced a --3way argument to `apply` in version 1.7.12 [1]. This provides a much nicer way to apply issues from Rietveld. After this change, `git cl patch` will add --3way after checking the git version for support. [1] https://github.com/git/git/commit/f247b10aa0f75727f1b4bdd67b060720b8219b29 BUG=None TEST=Ran `git cl patch <issue>` with both clean and unclean patches, also checked behaviour of --reject is preserved. R=maruel@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210695

Patch Set 1 #

Patch Set 2 : Baseline from reverted change in http://crrev.com/16211005 #

Patch Set 3 : add a git version check ( >= 1.7.12 ) #

Patch Set 4 : rebase for r210503 #

Created: 7 years, 5 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+12 lines, -1 line)			Patch
	M	git_cl.py	View	1 2 3	4 chunks	+12 lines, -1 line	0 comments	Download

Messages

Total messages: 4 (0 generated)

Expand Messages | Collapse Messages

tapted

Committed patchset #4 manually as r210695 (presubmit successful).

7 years, 5 months ago (2013-07-10 01:29:28 UTC) #3

Isaac (away)

7 years, 5 months ago (2013-07-10 22:11:16 UTC) #4

Message was sent while issue was closed.

Seems to cause presubmit failure: 
************* Module git_cl
C0322: 93,2:IsGitVersionAtLeast: Operator not preceded by a space
  PREFIX='git version '
        ^

Expand Messages | Collapse Messages