* [PATCH] rebase: don't invoke the pager for each commit summary
@ 2010-01-30 16:23 Markus Heidelberg
2010-01-30 16:47 ` Johannes Schindelin
2010-02-01 5:39 ` Stephen Boyd
0 siblings, 2 replies; 5+ messages in thread
From: Markus Heidelberg @ 2010-01-30 16:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Stephen Boyd, Markus Heidelberg
This regression was introduced by commit 0aa958d (rebase: replace
antiquated sed invocation, 2010-01-24), which changed the invocation of
"git rev-list | sed" to "git log".
It can be reproduced by something like this:
$ git rebase -s recursive origin/master
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
git-rebase.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index b5d9178..fb4fef7 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -86,7 +86,7 @@ continue_merge () {
fi
fi
test -z "$GIT_QUIET" &&
- git log --format=%s -1 "$cmt"
+ GIT_PAGER='' git log --format=%s -1 "$cmt"
prev_head=`git rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later
--
1.7.0.rc0.71.g95b6e
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] rebase: don't invoke the pager for each commit summary
2010-01-30 16:23 [PATCH] rebase: don't invoke the pager for each commit summary Markus Heidelberg
@ 2010-01-30 16:47 ` Johannes Schindelin
2010-01-30 16:46 ` Markus Heidelberg
2010-02-01 5:39 ` Stephen Boyd
1 sibling, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2010-01-30 16:47 UTC (permalink / raw)
To: Markus Heidelberg; +Cc: Junio C Hamano, git, Stephen Boyd
Hi,
On Sat, 30 Jan 2010, Markus Heidelberg wrote:
> diff --git a/git-rebase.sh b/git-rebase.sh
> index b5d9178..fb4fef7 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -86,7 +86,7 @@ continue_merge () {
> fi
> fi
> test -z "$GIT_QUIET" &&
> - git log --format=%s -1 "$cmt"
> + GIT_PAGER='' git log --format=%s -1 "$cmt"
Would it not be better 'git --no-pager log [...]'?
Ciao,
Dscho
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] rebase: don't invoke the pager for each commit summary
2010-01-30 16:47 ` Johannes Schindelin
@ 2010-01-30 16:46 ` Markus Heidelberg
2010-01-30 16:52 ` Markus Heidelberg
0 siblings, 1 reply; 5+ messages in thread
From: Markus Heidelberg @ 2010-01-30 16:46 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git, Stephen Boyd
Johannes Schindelin, 2010-01-30:
> Hi,
>
> On Sat, 30 Jan 2010, Markus Heidelberg wrote:
>
> > diff --git a/git-rebase.sh b/git-rebase.sh
> > index b5d9178..fb4fef7 100755
> > --- a/git-rebase.sh
> > +++ b/git-rebase.sh
> > @@ -86,7 +86,7 @@ continue_merge () {
> > fi
> > fi
> > test -z "$GIT_QUIET" &&
> > - git log --format=%s -1 "$cmt"
> > + GIT_PAGER='' git log --format=%s -1 "$cmt"
>
> Would it not be better 'git --no-pager log [...]'?
That was my initial fix, but then I found this in line 519:
GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
and decided to keep consistency.
Don't know.
Markus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rebase: don't invoke the pager for each commit summary
2010-01-30 16:23 [PATCH] rebase: don't invoke the pager for each commit summary Markus Heidelberg
2010-01-30 16:47 ` Johannes Schindelin
@ 2010-02-01 5:39 ` Stephen Boyd
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Boyd @ 2010-02-01 5:39 UTC (permalink / raw)
To: Markus Heidelberg; +Cc: Junio C Hamano, git
On Sat, Jan 30, 2010 at 8:23 AM, Markus Heidelberg
<markus.heidelberg@web.de> wrote:
> This regression was introduced by commit 0aa958d (rebase: replace
> antiquated sed invocation, 2010-01-24), which changed the invocation of
> "git rev-list | sed" to "git log".
>
> It can be reproduced by something like this:
> $ git rebase -s recursive origin/master
>
> Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
>
Thanks. Maybe you can use git show too instead of git log -1?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-01 5:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-30 16:23 [PATCH] rebase: don't invoke the pager for each commit summary Markus Heidelberg
2010-01-30 16:47 ` Johannes Schindelin
2010-01-30 16:46 ` Markus Heidelberg
2010-01-30 16:52 ` Markus Heidelberg
2010-02-01 5:39 ` Stephen Boyd
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 NNTP newsgroup(s).