git-p4: disable-rebase: allow setting this via configuration

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 88d109debb8d85f9c3f850afd89d4513250f026b..699fcc8f8a6253e0f27bb21372297cd38ac0ffb3 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -342,7 +342,7 @@ These options can be used to modify 'git p4 submit' behavior.
 
 --disable-rebase::
     Disable the automatic rebase after all commits have been successfully
 
 --disable-rebase::
     Disable the automatic rebase after all commits have been successfully

-    submitted.
+    submitted. Can also be set with git-p4.disableRebase.

 
 Rebase options
 ~~~~~~~~~~~~~~
 
 Rebase options
 ~~~~~~~~~~~~~~


@@ -658,6 +658,9 @@ git-p4.conflict::
        Specify submit behavior when a conflict with p4 is found, as per
        --conflict.  The default behavior is 'ask'.
 
        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.
 IMPLEMENTATION DETAILS
 ----------------------
 * Changesets from p4 are imported using Git fast-import.

diff --git a/git-p4.py b/git-p4.py
index f4a6f3b4c3d09cd6ed2a4062b3a1dc418345aa64..9b120bd35d0b98172e5f5bc44e7a6af4c87b9f03 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1368,7 +1368,7 @@ def __init__(self):
         self.shelve = False
         self.update_shelve = list()
         self.commit = ""
         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")
         self.prepare_p4_only = False
         self.conflict_behavior = None
         self.isWindows = (platform.system() == "Windows")