From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Andreas Krey <a.krey@gmx.de>,
John Szakmeister <john@szakmeister.net>
Subject: Re: [PATCH] fixup! pull: require choice between rebase/merge on non-fast-forward pull
Date: Sun, 14 Jul 2013 21:23:05 -0700 [thread overview]
Message-ID: <7vr4f0e9jq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130714150318.GB2239@serenity.lan> (John Keeping's message of "Sun, 14 Jul 2013 16:03:18 +0100")
John Keeping <john@keeping.me.uk> writes:
> Here is that patch. The test changes here are all reverting changes in
> ae2dab2 (pull: require choice between rebase/merge on non-fast-forward
> pull, 2013-06-27) - with this change to git-pull.sh the only change
> needed in the tests is in t5524-pull-msg:
>
> $ git diff ae2dab2^ -- t
> diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
> index 8cccecc..660714b 100755
> --- a/t/t5524-pull-msg.sh
> +++ b/t/t5524-pull-msg.sh
> @@ -25,7 +25,7 @@ test_expect_success setup '
> test_expect_success pull '
> (
> cd cloned &&
> - git pull --log &&
> + git pull --log --merge &&
Nice. "--log" is not a pass-thru option to "fetch" and here it does
not count as part of "$@", so we do require the user to say how the
integration should happen, between --merge and --rebase.
Thanks, will queue.
> git log -2 &&
> git cat-file commit HEAD >result &&
> grep Dollar result
>
> git-pull.sh | 1 +
> t/annotate-tests.sh | 2 +-
> t/t4013-diff-various.sh | 2 --
> t/t4200-rerere.sh | 2 --
> t/t5500-fetch-pack.sh | 6 +-----
> t/t5521-pull-options.sh | 2 --
> t/t5700-clone-reference.sh | 4 ++--
> t/t6022-merge-rename.sh | 2 --
> t/t6026-merge-attr.sh | 2 +-
> t/t6029-merge-subtree.sh | 1 -
> t/t6037-merge-ours-theirs.sh | 2 --
> t/t9114-git-svn-dcommit-merge.sh | 2 +-
> t/t9400-git-cvsserver-server.sh | 2 +-
> t/t9500-gitweb-standalone-no-errors.sh | 2 +-
> 14 files changed, 9 insertions(+), 23 deletions(-)
>
> diff --git a/git-pull.sh b/git-pull.sh
> index 5ce67f9..0ff4a98 100755
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -279,6 +279,7 @@ case "$merge_head" in
> merge_head=${merge_head% }
> if test -z "$rebase$no_ff$ff_only${squash#--no-squash}" &&
> test -n "$orig_head" &&
> + test $# = 0 &&
> ! $(git merge-base --is-ancestor "$orig_head" "$merge_head")
> then
> echo >&2 "orig-head was $orig_head"
> diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
> index af02c6d..c56a77d 100644
> --- a/t/annotate-tests.sh
> +++ b/t/annotate-tests.sh
> @@ -79,7 +79,7 @@ test_expect_success \
>
> test_expect_success \
> 'merge-setup part 3' \
> - 'git pull --merge . branch1'
> + 'git pull . branch1'
>
> test_expect_success \
> 'Two lines blamed on A, one on B, two on B1, one on B2' \
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index 1ee2198..e77c09c 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -12,8 +12,6 @@ LF='
>
> test_expect_success setup '
>
> - git config pull.rebase false &&
> -
> GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
> GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
> export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
> index 0563357..7f6666f 100755
> --- a/t/t4200-rerere.sh
> +++ b/t/t4200-rerere.sh
> @@ -25,8 +25,6 @@ test_description='git rerere
> . ./test-lib.sh
>
> test_expect_success 'setup' '
> - git config pull.rebase false &&
> -
> cat >a1 <<-\EOF &&
> Some title
> ==========
> diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> index 4be8877..fd2598e 100755
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -143,11 +143,7 @@ test_expect_success 'clone shallow depth 1 with fsck' '
> '
>
> test_expect_success 'clone shallow' '
> - git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow &&
> - (
> - cd shallow &&
> - git config pull.rebase false
> - )
> + git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow
> '
>
> test_expect_success 'clone shallow depth count' '
> diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
> index d821fab..453aba5 100755
> --- a/t/t5521-pull-options.sh
> +++ b/t/t5521-pull-options.sh
> @@ -91,8 +91,6 @@ test_expect_success 'git pull --force' '
> [branch "master"]
> remote = two
> merge = refs/heads/master
> - [pull]
> - rebase = false
> EOF
> git pull two &&
> test_commit A &&
> diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
> index 306badf..6537911 100755
> --- a/t/t5700-clone-reference.sh
> +++ b/t/t5700-clone-reference.sh
> @@ -94,7 +94,7 @@ cd "$base_dir"
>
> test_expect_success 'pulling changes from origin' \
> 'cd C &&
> -git pull --merge origin'
> +git pull origin'
>
> cd "$base_dir"
>
> @@ -109,7 +109,7 @@ cd "$base_dir"
>
> test_expect_success 'pulling changes from origin' \
> 'cd D &&
> -git pull --merge origin'
> +git pull origin'
>
> cd "$base_dir"
>
> diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
> index e12d90b..c680f78 100755
> --- a/t/t6022-merge-rename.sh
> +++ b/t/t6022-merge-rename.sh
> @@ -10,8 +10,6 @@ modify () {
>
> test_expect_success setup \
> '
> -git config pull.rebase false &&
> -
> cat >A <<\EOF &&
> a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
> b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
> diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
> index 5428f19..5e43997 100755
> --- a/t/t6026-merge-attr.sh
> +++ b/t/t6026-merge-attr.sh
> @@ -172,7 +172,7 @@ test_expect_success 'up-to-date merge without common ancestor' '
> test_tick &&
> (
> cd repo1 &&
> - git pull --merge ../repo2 master
> + git pull ../repo2 master
> )
> '
>
> diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
> index 3ca29c4..73fc240 100755
> --- a/t/t6029-merge-subtree.sh
> +++ b/t/t6029-merge-subtree.sh
> @@ -41,7 +41,6 @@ test_expect_success 'setup' '
> mkdir git &&
> cd git &&
> git init &&
> - git config pull.rebase false &&
> echo git >git.c &&
> o2=$(git hash-object git.c) &&
> git add git.c &&
> diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
> index 41bf060..3889eca 100755
> --- a/t/t6037-merge-ours-theirs.sh
> +++ b/t/t6037-merge-ours-theirs.sh
> @@ -66,8 +66,6 @@ test_expect_success 'binary file with -Xours/-Xtheirs' '
> '
>
> test_expect_success 'pull passes -X to underlying merge' '
> - git config pull.rebase false &&
> -
> git reset --hard master && git pull -s recursive -Xours . side &&
> git reset --hard master && git pull -s recursive -X ours . side &&
> git reset --hard master && git pull -s recursive -Xtheirs . side &&
> diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
> index dfce024..f524d2f 100755
> --- a/t/t9114-git-svn-dcommit-merge.sh
> +++ b/t/t9114-git-svn-dcommit-merge.sh
> @@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
> echo friend > README &&
> cat tmp >> README &&
> git commit -a -m "friend" &&
> - git pull --merge . merge
> + git pull . merge
> '
>
> test_debug 'gitk --all & sleep 1'
> diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
> index 76b8640..0431386 100755
> --- a/t/t9400-git-cvsserver-server.sh
> +++ b/t/t9400-git-cvsserver-server.sh
> @@ -46,7 +46,7 @@ test_expect_success 'setup' '
> touch secondrootfile &&
> git add secondrootfile &&
> git commit -m "second root") &&
> - git pull --merge secondroot master &&
> + git pull secondroot master &&
> git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
> GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
> GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
> diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
> index 787c6cc..6fca193 100755
> --- a/t/t9500-gitweb-standalone-no-errors.sh
> +++ b/t/t9500-gitweb-standalone-no-errors.sh
> @@ -328,7 +328,7 @@ test_expect_success \
> git add b &&
> git commit -a -m "On branch" &&
> git checkout master &&
> - git pull --merge . b &&
> + git pull . b &&
> git tag merge_commit'
>
> test_expect_success \
next prev parent reply other threads:[~2013-07-15 4:23 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 11:50 first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-22 18:07 ` Junio C Hamano
2013-05-23 9:06 ` Andreas Krey
2013-05-23 9:48 ` John Szakmeister
2013-05-23 10:07 ` Jeremy Rosen
2013-05-23 10:29 ` Andreas Krey
2013-05-23 11:08 ` John Keeping
2013-05-23 16:01 ` Junio C Hamano
2013-05-23 16:41 ` John Keeping
2013-05-23 21:01 ` Junio C Hamano
2013-05-23 21:55 ` John Keeping
2013-05-23 21:59 ` Felipe Contreras
2013-05-23 22:11 ` Junio C Hamano
2013-05-23 22:46 ` Felipe Contreras
2013-05-23 22:54 ` Junio C Hamano
2013-05-23 23:09 ` Felipe Contreras
2013-05-23 23:26 ` Junio C Hamano
2013-05-23 23:53 ` Felipe Contreras
2013-05-24 8:29 ` John Keeping
2013-05-24 9:38 ` John Szakmeister
2013-05-24 0:03 ` Linus Torvalds
2013-05-24 0:21 ` Junio C Hamano
2013-05-24 0:24 ` Linus Torvalds
2013-05-24 0:25 ` Felipe Contreras
2013-05-24 0:32 ` Felipe Contreras
2013-05-24 16:26 ` Junio C Hamano
2013-05-24 20:47 ` Philip Oakley
2013-06-27 19:48 ` [PATCH] pull: require choice between rebase/merge on non-fast-forward pull Junio C Hamano
2013-06-27 20:10 ` W. Trevor King
2013-06-27 21:20 ` Junio C Hamano
2013-06-28 1:08 ` W. Trevor King
2013-06-28 6:34 ` Matthieu Moy
2013-06-28 9:09 ` W. Trevor King
2013-06-28 11:52 ` Matthieu Moy
2013-06-28 12:28 ` W. Trevor King
2013-06-27 20:11 ` Fredrik Gustafsson
2013-06-27 20:49 ` Junio C Hamano
2013-06-27 20:30 ` W. Trevor King
2013-06-27 20:58 ` Junio C Hamano
2013-06-27 22:16 ` Matthieu Moy
2013-06-28 1:19 ` W. Trevor King
2013-06-28 8:09 ` John Keeping
2013-06-28 17:22 ` Junio C Hamano
2013-06-28 17:42 ` John Keeping
2013-06-28 22:41 ` Junio C Hamano
2013-07-02 21:18 ` John Keeping
2013-07-14 15:03 ` [PATCH] fixup! " John Keeping
2013-07-15 4:23 ` Junio C Hamano [this message]
2013-08-28 23:22 ` [PATCH] " Felipe Contreras
2013-07-18 14:30 ` John Keeping
2013-07-18 17:38 ` Andreas Schwab
2013-07-18 18:00 ` Junio C Hamano
2013-07-18 19:35 ` [PATCH v2] " Junio C Hamano
2013-07-19 0:54 ` Eric Sunshine
2013-07-19 16:22 ` Junio C Hamano
2013-07-19 20:29 ` Eric Sunshine
2013-07-19 22:20 ` Junio C Hamano
2013-07-19 22:30 ` Eric Sunshine
2013-07-19 22:55 ` Junio C Hamano
2014-01-22 19:08 ` Flimm
2013-05-24 17:11 ` first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-24 19:23 ` Junio C Hamano
2013-05-23 19:25 ` Andreas Krey
2013-05-24 9:29 ` Holger Hellmuth (IKS)
2013-05-24 13:42 ` Andreas Krey
2013-05-24 15:05 ` Holger Hellmuth (IKS)
2013-05-24 17:24 ` Andreas Krey
2013-05-23 11:34 ` Felipe Contreras
2013-05-23 12:21 ` Andreas Krey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr4f0e9jq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=john@szakmeister.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).