From: Andrew Morton <akpm@linux-foundation•org>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Linus Torvalds <torvalds@linux-foundation•org>, git@vger•kernel.org
Subject: Re: my git problem
Date: Mon, 28 Apr 2008 12:33:00 -0700 [thread overview]
Message-ID: <20080428123300.f5406ca9.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0804282012140.19187@eeepc-johanness>
On Mon, 28 Apr 2008 20:13:43 +0100 (BST) Johannes Schindelin <Johannes.Schindelin@gmx•de> wrote:
> > Oh well. Can you suggest how I can extract the changelogs for the
> > patches which `git-diff origin...git-ia64' will print out?
>
> I think you get what you want with
>
> $ git-log --cherry-pick origin...git-ia64
>
> (although I might be wrong on the order of origin and git-ia64).
Nope, that still generates thousands of lines of wrongness.
It's also very slow, for a non-empty tree:
git-log --cherry-pick origin...git-audit-master > /dev/null 50.47s user 0.56s system 99% cpu 51.043 total
git-diff origin...git-audit-master > /dev/null 0.35s user 0.02s system 100% cpu 0.369 total
weird that it's hundreds of times slower than the corresponding git-diff.
he-who-pulls-75-trees would be unhappy.
Back to my original problem...
>From my old script:
doit()
{
tree=$1
upstream=$2
cd $GIT_TREE
git reset --hard "$upstream"
git fetch "$tree" || exit 1
git merge --no-commit 'test merge' HEAD FETCH_HEAD > /dev/null
{
git_header "$tree"
git log --no-merges ORIG_HEAD..FETCH_HEAD
git diff --patch-with-stat ORIG_HEAD
} >$PULL/$tree.patch
{
echo DESC
echo $tree.patch
echo EDESC
git_header "$tree"
git log --no-merges ORIG_HEAD..FETCH_HEAD
} >$PULL/$tree.txt
git reset --hard "$upstream"
}
the `git log' here does what I want.
The new version:
doit()
{
tree=$1
upstream=$2
cd $GIT_TREE
git reset --hard "$upstream"
git fetch "$tree" || exit 1
{
git_header "$tree"
git log --no-merges $upstream...$tree
git diff -p --stat --no-merges $upstream...$tree
} >$PULL/$tree.patch
{
echo DESC
echo $tree.patch
echo EDESC
git_header "$tree"
# git log --no-merges $upstream...$tree
} >$PULL/$tree.txt
git reset --hard "$upstream"
}
loses the changelogs :(
next prev parent reply other threads:[~2008-04-28 19:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-27 18:29 my git problem Andrew Morton
2008-04-27 19:15 ` Linus Torvalds
2008-04-27 19:44 ` Andrew Morton
2008-04-27 20:24 ` Linus Torvalds
2008-04-28 18:45 ` Andrew Morton
2008-04-28 18:49 ` Johannes Schindelin
2008-04-28 19:09 ` Andrew Morton
2008-04-28 19:13 ` Johannes Schindelin
2008-04-28 19:28 ` Linus Torvalds
2008-04-29 17:15 ` J. Bruce Fields
2008-04-30 8:17 ` Jakub Narebski
2008-04-28 19:33 ` Andrew Morton [this message]
2008-04-28 19:21 ` Linus Torvalds
2008-04-28 19:54 ` Andrew Morton
2008-05-01 6:01 ` Carl Worth
2008-04-28 19:52 ` Daniel Barkalow
2008-04-28 21:35 ` Andrew Morton
2008-04-28 21:47 ` Linus Torvalds
2008-04-28 22:04 ` Johannes Schindelin
2008-04-28 22:14 ` Linus Torvalds
2008-04-29 2:14 ` Andrew Morton
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080428123300.f5406ca9.akpm@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox