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 <"$GIT_DIR/FETCH_HEAD") || exit > case "$rebase" in > true) > 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 $log_arg $strategy_args $merge_args $verbosity $progress" > eval="$eval $gpg_sign_args" > - eval="$eval -m \"\$merge_name\" $merge_head" > + eval="$eval FETCH_HEAD" > ;; > esac > eval "exec $eval" > > as we seem to special-case the name FETCH_HEAD. It assumes that > git-merge's parsing of FETCH_HEAD is the same as what we do in git-pull, > but that seems safe. Unfortunately we still have to compute $merge_head > ourselves here for the "git pull --rebase" case.
I agree that this is a better choice. My concern with your other suggestion is that it looks like it wouldn't honor the --no-edit flag or GIT_MERGE_AUTOEDIT=no. That might break some use cases, such as non-interactive applications. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
