revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
		
							parent
							
								
									6f8fbf4aa4
								
							
						
					
					
						commit
						93ba78d6f4
					
				
					 1006 changed files with 60537 additions and 148724 deletions
				
			
		|  | @ -429,7 +429,11 @@ __git_ps1 () | |||
| 		__git_eread "$g/rebase-merge/head-name" b | ||||
| 		__git_eread "$g/rebase-merge/msgnum" step | ||||
| 		__git_eread "$g/rebase-merge/end" total | ||||
| 		r="|REBASE" | ||||
| 		if [ -f "$g/rebase-merge/interactive" ]; then | ||||
| 			r="|REBASE-i" | ||||
| 		else | ||||
| 			r="|REBASE-m" | ||||
| 		fi | ||||
| 	else | ||||
| 		if [ -d "$g/rebase-apply" ]; then | ||||
| 			__git_eread "$g/rebase-apply/next" step | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue