pull: add the --gpg-sign option.
git merge already allows us to sign commits, and git rebase has recently learned how to do so as well. Teach git pull to parse the -S/--gpg-sign option and pass this along to merge or rebase, as appropriate. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									3ee5e54038
								
							
						
					
					
						commit
						ea230d8b62
					
				
							
								
								
									
										11
									
								
								git-pull.sh
								
								
								
								
							
							
						
						
									
										11
									
								
								git-pull.sh
								
								
								
								
							|  | @ -138,6 +138,15 @@ do | |||
| 	--no-verify-signatures) | ||||
| 		verify_signatures=--no-verify-signatures | ||||
| 		;; | ||||
| 	--gpg-sign|-S) | ||||
| 		gpg_sign_args=-S | ||||
| 		;; | ||||
| 	--gpg-sign=*) | ||||
| 		gpg_sign_args=$(git rev-parse --sq-quote "-S${1#--gpg-sign=}") | ||||
| 		;; | ||||
| 	-S*) | ||||
| 		gpg_sign_args=$(git rev-parse --sq-quote "$1") | ||||
| 		;; | ||||
| 	--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run) | ||||
| 		dry_run=--dry-run | ||||
| 		;; | ||||
|  | @ -305,11 +314,13 @@ merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit | |||
| case "$rebase" in | ||||
| true) | ||||
| 	eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity" | ||||
| 	eval="$eval $gpg_sign_args" | ||||
| 	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" | ||||
| 	;; | ||||
| *) | ||||
| 	eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only" | ||||
| 	eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" | ||||
| 	eval="$eval $gpg_sign_args" | ||||
| 	eval="$eval \"\$merge_name\" HEAD $merge_head" | ||||
| 	;; | ||||
| esac | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 brian m. carlson
						brian m. carlson