Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-21 Thread Johannes Schindelin
Hi Junio, On 2015-04-20 21:28, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: @@ -334,7 +333,7 @@ true) 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 -m \\$merge_name\

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-20 Thread Jeff King
On Mon, Apr 20, 2015 at 11:59:04AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: @@ -334,7 +333,7 @@ true) eval=git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only eval=$eval $log_arg $strategy_args $merge_args $verbosity $progress

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Apr 20, 2015 at 11:59:04AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: @@ -334,7 +333,7 @@ true) eval=git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only eval=$eval $log_arg $strategy_args

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without --edit. * show the summary merge log message twice. We

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-19 Thread Jeff King
On Sat, Apr 18, 2015 at 06:39:20PM -0700, Junio C Hamano wrote: This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without --edit. * show the summary merge

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-19 Thread Jeff King
On Sun, Apr 19, 2015 at 05:38:26PM +, brian m. carlson wrote: eval=git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity @@ -334,7 +333,7 @@ true) eval=git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only eval=$eval

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-19 Thread brian m. carlson
On Sun, Apr 19, 2015 at 09:07:46AM -0400, Jeff King wrote: Which I guess is just: diff --git a/git-pull.sh b/git-pull.sh index 252969e..15d9431 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -323,7 +323,6 @@ then fi fi -merge_name=$(git fmt-merge-msg $log_arg

[BUG] git pull will regress between 'master' and 'pu'

2015-04-18 Thread Junio C Hamano
This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without --edit. * show the summary merge log message twice. -- To unsubscribe from this list: send the line