From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: "Eric Scouten" <eric@scouten.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Merland Romain" <merlorom@yahoo.fr>,
"Miguel Torroja" <miguel.torroja@gmail.com>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Lex Spoon" <lex@lexspoon.org>,
viniciusalexandre@gmail.com, "Luke Diamand" <luke@diamand.org>
Subject: [PATCHv2 1/6] git-p4: disable-rebase: allow setting this via configuration
Date: Fri, 8 Jun 2018 21:32:43 +0100 [thread overview]
Message-ID: <20180608203248.16311-2-luke@diamand.org> (raw)
In-Reply-To: <20180608203248.16311-1-luke@diamand.org>
This just lets you set the --disable-rebase option with the
git configuration options git-p4.disableRebase. If you're
using this option, you probably want to set it all the time
for a given repo.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
Documentation/git-p4.txt | 5 ++++-
git-p4.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index e8452528fc..3d83842e47 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -367,7 +367,7 @@ These options can be used to modify 'git p4 submit' behavior.
--disable-rebase::
Disable the automatic rebase after all commits have been successfully
- submitted.
+ submitted. Can also be set with git-p4.disableRebase.
Rebase options
~~~~~~~~~~~~~~
@@ -690,6 +690,9 @@ git-p4.conflict::
Specify submit behavior when a conflict with p4 is found, as per
--conflict. The default behavior is 'ask'.
+git-p4.disableRebase::
+ Do not rebase the tree against p4/master following a submit.
+
IMPLEMENTATION DETAILS
----------------------
* Changesets from p4 are imported using Git fast-import.
diff --git a/git-p4.py b/git-p4.py
index c4581d20a6..5ab9421af8 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1379,7 +1379,7 @@ def __init__(self):
self.shelve = False
self.update_shelve = list()
self.commit = ""
- self.disable_rebase = False
+ self.disable_rebase = gitConfigBool("git-p4.disableRebase")
self.prepare_p4_only = False
self.conflict_behavior = None
self.isWindows = (platform.system() == "Windows")
--
2.17.0.392.gdeb1a6e9b7
next prev parent reply other threads:[~2018-06-08 20:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 20:32 [PATCHv2 0/6] git-p4: some small fixes updated Luke Diamand
2018-06-08 20:32 ` Luke Diamand [this message]
2018-06-08 20:32 ` [PATCHv2 2/6] git-p4: add option to disable syncing of p4/master with p4 Luke Diamand
2018-06-08 20:32 ` [PATCHv2 3/6] git-p4: better error reporting when p4 fails Luke Diamand
2018-06-08 20:32 ` [PATCHv2 4/6] git-p4: raise exceptions from p4CmdList based on error from p4 server Luke Diamand
2018-06-08 20:32 ` [PATCHv2 5/6] git-p4: narrow the scope of exceptions caught when parsing an int Luke Diamand
2018-06-08 20:32 ` [PATCHv2 6/6] git-p4: auto-size the block Luke Diamand
2018-06-12 17:10 ` [PATCHv2 0/6] git-p4: some small fixes updated Junio C Hamano
2018-06-12 21:24 ` Luke Diamand
2018-06-12 21:35 ` Junio C Hamano
2018-06-12 21:49 ` Luke Diamand
2018-06-12 21:53 ` Eric Sunshine
2018-06-12 22:23 ` Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180608203248.16311-2-luke@diamand.org \
--to=luke@diamand.org \
--cc=eric@scouten.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=lex@lexspoon.org \
--cc=merlorom@yahoo.fr \
--cc=miguel.torroja@gmail.com \
--cc=szeder.dev@gmail.com \
--cc=viniciusalexandre@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).