forked from terabyte/jgit
    
        
        - 
                Notifications
    You must be signed in to change notification settings 
- Fork 5
STRY51637620: merge 5.9 changes into upstream 6.1 #23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
      
            davidhodgson-servicenow
  wants to merge
  31
  commits into
  stable-6.1
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
scratch/STRY51637620-merge-5.9-changes-into-6.1
  
      
      
   
  
    
  
  
  
 
  
      
    base: stable-6.1
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            STRY51637620: merge 5.9 changes into upstream 6.1 #23
                    davidhodgson-servicenow
  wants to merge
  31
  commits into
  stable-6.1
from
scratch/STRY51637620-merge-5.9-changes-into-6.1
  
      
      
   
              
            Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    …ntly loaded application files and new changes applied while Import from SC (#4) [Delta-Loading]Find the delta of changes between currently loaded application files and new changes applied while Import from SC This is a customization in the JGIT to filter out the noise and reduce the source control app install on the service now instance. The customization ONLY includes changes to DiffCommand and DiffFormatter and we exposed a new method and the purpose is to not break existing JGIT in any way.
fixed compilation issues for delat loading
Support SSH for Basic authentication (without MID server) + On the instance we do not want to grant access to GIT_SSH environment variable. Adding a try/catch to not make it fail.
1. commit c81ea59 Author: Matt Coleman <[email protected]> Date: Mon Nov 30 14:03:10 2015 -0800 java.policy modifications to JGit - GIT_CONFIG_NOSYSTEM no longer needed - permission to create symlinks no longer needed - permission to read user's home directory no longer needed 2. commit 56837c8 Author: anjanakr <[email protected]> Date: Thu Feb 13 08:52:49 2020 -0800 DEF0087691: Set FS to POSIX if OS is not Windows Update FS to FS_POSIX only if the detected OS is not Windows 3. fixed compilation and test case issues
…#17) Co-authored-by: junna.cui <[email protected]>
…lib.ConfigTest.testReadUserConfigWithInvalidCharactersStripped(ConfigTest.java:280))
…l GitSystemConfig. No need to customize jGit to support null GitSystemConfig. FS.DETECTED's gitSystemConfig.value is set to null by calling setFs() api in initRepo() or cloneGitFromRemoteRepo() in AGitRepository.
This reverts commit 37e36e9.
This reverts commit f767064.
…ough createExecChannel api to avoid reading TERM from env
…TE differences STRY51783300: Modify hidden file removal to avoid formatting ADD/DELETE differences
STRY51637620: merge our 5.9 changes into 6.1
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
No description provided.