On Fri, May 04, 2018 at 08:07:53AM -0500, Eric Blake wrote:
> [adding a cross-post to the git mailing list]
>
> On 05/04/2018 02:10 AM, Cornelia Huck wrote:
> > On Thu, 3 May 2018 22:51:40 +0300
> > "Michael S. Tsirkin" wrote:
> >
> > > This wa
On Thu, Sep 10, 2015 at 02:03:48PM -0700, Jacob Keller wrote:
> On Thu, Sep 10, 2015 at 1:09 PM, Philip Oakley wrote:
> > From: "Jacob Keller"
> >>
> >> On Thu, Sep 10, 2015 at 11:44 AM, Junio C Hamano
> >> wrote:
> >>>
> >>> Jacob Keller writes:
> >>>
> I hadn't thought of separating the
On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote:
> The problem with "empty commit trick" is that it is a commit whose
> sole purpose is to describe the series, and its presence makes it
> clear where the series ends, but the topology does not tell where
> the series begins, so it is
On Fri, Aug 05, 2016 at 08:39:58AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote:
> >> The problem with "empty commit trick" is that it is a commit whose
> >&g
I have this in .git/config
[trailer "r"]
key = Reviewed-by
command = "echo \"Michael S. Tsirkin http://vger.kernel.org/majordomo-info.html
On Wed, Apr 06, 2016 at 06:58:30PM +0200, Matthieu Moy wrote:
> "Michael S. Tsirkin" writes:
>
> > I have this in .git/config
> >
> > [trailer "r"]
> > key = Reviewed-by
> > command = "echo \"Michael S. Tsirkin &
If an explicit -t trailer is used, only parse
trailers from command line.
Signed-off-by: Michael S. Tsirkin
---
trailer.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/trailer.c b/trailer.c
index 8e5be91..34654fc 100644
--- a/trailer.c
+++ b/trailer.c
On Wed, Apr 06, 2016 at 10:42:42AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Wed, Apr 06, 2016 at 06:58:30PM +0200, Matthieu Moy wrote:
> >> "Michael S. Tsirkin" writes:
> >>
> >> > I have this in .git/co
Reverts can typically be treated like squash. Eliminating both the
original commit and the revert would be even nicer, but this seems a bit
harder to implement.
Signed-off-by: Michael S. Tsirkin
---
git-rebase--interactive.sh | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff
Slightly slower, but will allow easy additional processing on it.
Signed-off-by: Michael S. Tsirkin
---
builtin/am.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c
index d003939..4180b04 100644
--- a/builtin/am.c
+++ b/builtin/am.c
Allow -t as a short-cut for --trailer.
Signed-off-by: Michael S. Tsirkin
---
builtin/interpret-trailers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index b99ae4b..18cf640 100644
--- a/builtin/interpret
Pass -t and --trailer flags to git-reinterpret-trailers.
Signed-off-by: Michael S. Tsirkin
---
builtin/am.c | 48
1 file changed, 48 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index 4180b04..480c4c2 100644
--- a/builtin/am.c
+++ b
t;]
key = Tested-by
command = "echo \"Michael S. Tsirkin \""
[trailer "r"]
key = Reviewed-by
command = "echo \"Michael S. Tsirkin \""
[trailer "a"]
key = Acked-by
command = "echo \"Mic
igned-off-by: Michael S. Tsirkin
---
trailer.h| 2 +-
builtin/interpret-trailers.c | 9 +++--
trailer.c| 10 +++---
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/trailer.h b/trailer.h
index 36b40b8..afcf680 100644
--- a/trailer.h
On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
>
> > Reverts can typically be treated like squash. Eliminating both the
> > original commit and the revert would be even nicer, but this s
On Thu, Apr 07, 2016 at 10:08:37AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Slightly slower, but will allow easy additional processing on it.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
>
> I haven't read 4/
On Thu, Apr 07, 2016 at 10:00:37AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > it's sometimes useful to be able to pass output message of
> > git-mailinfo through git-interpret-trailers,
> > but that creates problems since that does n
On Thu, Apr 07, 2016 at 09:55:29AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Allow -t as a short-cut for --trailer.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
>
> As I do not think interpret-trailers is meant to b
On Thu, Apr 07, 2016 at 10:26:33AM -0700, Junio C Hamano wrote:
> Matthieu Moy writes:
>
> >> I am in principle OK with the later step that teaches a single
> >> letter option to end-user facing "git am" that would be turned into
> >> "--trailer" when it calls out to "interpret-trailers" (I haven
On Thu, Apr 07, 2016 at 10:30:02AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Thu, Apr 07, 2016 at 09:55:29AM -0700, Junio C Hamano wrote:
> >> "Michael S. Tsirkin" writes:
> >>
> >> > Allow -t as a s
On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
>
> > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> > >
> > > On Thu, 7 Apr 2016, Michael S. Tsirk
On Fri, Apr 08, 2016 at 01:42:12PM +0200, Matthieu Moy wrote:
> Johannes Schindelin writes:
>
> > git revert -n deadbeef
> > git commit --squash deadbeef
> >
> > where "deadbeef" is the placeholder for the actual commit to revert.
> >
> > And indeed, I use exactly this song and dance quit
On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Thu, 7 Apr 2016, Michael S. Tsirkin wrote:
>
> > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote:
> > >
> > > On Thu, 7 Apr 2016, Michael S. Tsirk
test ack! handling
Signed-off-by: Michael S. Tsirkin
---
t/t3415-rebase-autosquash.sh | 15 +++
1 file changed, 15 insertions(+)
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 8f53e54..e78897d 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415
From: Michael S. Tsirkin
Subject: [PATCH] foo.c: change b to c
Date: Wed Apr 6 22:07:34 2016 +0300
foo.c: change b to c
Change B to C
Signed-off-by: Michael
document ack! behaviour and use
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-rebase.txt | 45 +++-
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0387b40..257d75c
git rebase --autosquash -i origin/master
before public branch push
The "cat" command above is actually a script that
parses the Ack mail to create the empty commit -
to be submitted separately.
Signed-off-by: Michael S. Tsirkin
---
git-reb
ff-by: Michael S. Tsirkin
---
contrib/git-ack | 91 +
1 file changed, 91 insertions(+)
create mode 100755 contrib/git-ack
diff --git a/contrib/git-ack b/contrib/git-ack
new file mode 100755
index 000..d8cba95
--- /dev/null
+++ b/contri
On Thu, Apr 07, 2016 at 10:34:51AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > No - but then I will need to re-run mailinfo to parse the result,
> > will I not?
>
> By the way, I suspect (if Christian did his implementation right
> when
On Wed, Apr 06, 2016 at 10:28:21PM -0400, Christian Couder wrote:
> On Wed, Apr 6, 2016 at 3:30 PM, Michael S. Tsirkin wrote:
> > On Wed, Apr 06, 2016 at 10:42:42AM -0700, Junio C Hamano wrote:
> >> "Michael S. Tsirkin" writes:
> >>
> >> > On We
On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote:
> On Sun, Apr 10, 2016 at 11:32 AM, Michael S. Tsirkin wrote:
> > On Wed, Apr 06, 2016 at 10:28:21PM -0400, Christian Couder wrote:
> >> On Wed, Apr 6, 2016 at 3:30 PM, Michael S. Tsirkin wrote:
> >> &
On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote:
> What I meant is that we could create new options called maybe
> trailer.autocommands and trailer..autocommands that default to
> 'true' and if 'false' the command would not be run automatically and
> the corresponding trailer would
On Mon, Apr 11, 2016 at 09:09:48AM +0200, Matthieu Moy wrote:
> "Michael S. Tsirkin" writes:
>
> > On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote:
> >> What I meant is that we could create new options called maybe
> >> trailer.autocommand
On Mon, Apr 11, 2016 at 01:02:07PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Sun, 10 Apr 2016, Michael S. Tsirkin wrote:
>
> > This implements a new ack! action for git rebase -i
> > It is essentially a middle ground between fixup! and squash!:
> > -
Cc junio
Bcc:
Subject: Re: [PATCH 1/4] rebase -i: add ack action
Message-ID: <20160411184535-mutt-send-email-...@redhat.com>
Reply-To:
In-Reply-To:
On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Mon, 11 Apr 2016, Michael S. Tsirkin w
Repost, sorry about the noise.
On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote:
> Hi Michael,
>
> On Mon, 11 Apr 2016, Michael S. Tsirkin wrote:
>
> > So far I only see examples of adding footers. If that's all we can think
> > up, wh
On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Repost, sorry about the noise.
> >
> > On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote:
> >> Hi Michael,
> >>
On Mon, Apr 11, 2016 at 10:03:39PM +0200, Matthieu Moy wrote:
> "Michael S. Tsirkin" writes:
>
> > On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote:
> >> "Michael S. Tsirkin" writes:
> >>
> >> > Repost, sorry about the
On Tue, Apr 12, 2016 at 09:07:30AM -0700, Junio C Hamano wrote:
> Matthieu Moy writes:
>
> > "Michael S. Tsirkin" writes:
> >
> >> Interesting. An empty commit would be rather easy to create on any
> >> branch, not just the current one, using
On Tue, Apr 19, 2016 at 04:07:35PM -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > On Tue, Apr 19, 2016 at 10:06 AM, Jeff King wrote:
> >> On Tue, Apr 19, 2016 at 08:17:38AM -0700, Stefan Beller wrote:
> >>
> >>> On Mon, Apr 18, 2016 at 10:03 PM, Jeff King wrote:
> >>>
> >>> > I guess
up the last commit that touched the
file(s) affected by the fixup
2. look up the last commit that touched the
line(s) affected by the fixup
this implements the first heuristic.
Signed-off-by: Michael S. Tsirkin
---
contrib/git-fixup | 8
1 file changed, 8 insertions(+)
create
Verify that patch ID is now stable against hunk reordering.
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 68 +
1 file changed, 63 insertions(+), 5 deletions(-)
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index
Clarify that patch ID is now a sum of hashes, not a hash.
Document --stable and --unstable flags.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-patch-id.txt | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-patch-id.txt b
against
hunk reodering:
- prepend header to each hunk (if not there)
- calculate SHA1 hash for each hunk separately
- sum all hashes to get patch id
Add a new flag --unstable to get the historical behaviour.
Add --stable which is a nop, for symmetry.
Signed-off-by: Michael S
On Thu, Mar 27, 2014 at 09:58:41AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Patch id changes if you reorder hunks in a diff.
>
> If you reorder hunks, the patch should no longer apply [*1*], so a
> feature to make patch-id stable
On Thu, Mar 27, 2014 at 09:58:41AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Patch id changes if you reorder hunks in a diff.
>
> If you reorder hunks, the patch should no longer apply [*1*], so a
> feature to make patch-id stable
On Thu, Mar 27, 2014 at 11:03:46AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > I started to remove that code, but then I recalled why I did it like
> > this. There is a good reason. Yes, you can't simply reorder hunks just
> > like
On Thu, Mar 27, 2014 at 08:39:17PM +0200, Michael S. Tsirkin wrote:
> On Thu, Mar 27, 2014 at 11:03:46AM -0700, Junio C Hamano wrote:
> > "Michael S. Tsirkin" writes:
> >
> > > I started to remove that code, but then I recalled why I did it like
> > &g
Verify that patch ID is now stable against hunk reordering.
Signed-off-by: Michael S. Tsirkin
---
changes from v1:
Use <<-\EOF to address comment by Eric Sunshine
t/t4204-patch-id.sh | 68 +
1 file changed, 63 insertions
Clarify that patch ID is now a sum of hashes, not a hash.
Document --stable and --unstable flags.
Signed-off-by: Michael S. Tsirkin
---
No change from v1.
Documentation/git-patch-id.txt | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/Documentation
ble to get the historical behaviour.
Add --stable which is a nop, for symmetry.
Signed-off-by: Michael S. Tsirkin
---
Changes from v1: documented motivation for supporting
hunk reordering (and not just file reordering).
No code changes.
Junio, you didn't respond so I'm not sure whe
On Fri, Mar 28, 2014 at 12:20:13PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Patch id changes if you reorder hunks in a diff.
> > As the result is functionally equivalent, this is surprising to many
> > people.
> > In particu
a new flag --unstable to get the historical behaviour.
Add --stable which is a nop, for symmetry.
Signed-off-by: Michael S. Tsirkin
---
changes from v2:
several bugfixes
changes from v1:
hanges from v1: documented motivation for supporting
diff splitting (and not just
Clarify that patch ID is now a sum of hashes, not a hash.
Document --stable and --unstable flags.
Signed-off-by: Michael S. Tsirkin
---
changes from v2:
explicitly list the kinds of changes against which patch ID is stable
Documentation/git-patch-id.txt | 23 ++-
1
Verify that patch ID is now stable against diff split and reordering.
Signed-off-by: Michael S. Tsirkin
---
Changes from v2:
added test to verify patch ID is stable against diff splitting
t/t4204-patch-id.sh | 117
1 file changed
On Mon, Mar 31, 2014 at 10:59:50AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Patch id changes if users
> > 1. reorder file diffs that make up a patch
> > or
> > 2. split a patch up to multiple diffs that touch the same path
> &g
On Mon, Mar 31, 2014 at 12:08:36PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Clarify that patch ID is now a sum of hashes, not a hash.
> > Document --stable and --unstable flags.
> >
> > Signed-off-by: Michael S.
On Mon, Mar 31, 2014 at 12:54:46PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > The hash used is mostly an internal implementation detail, isn't it?
>
> Yes, but that does not mean we can break people who keep an external
> database index
On Wed, Apr 02, 2014 at 11:18:26AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Mon, Mar 31, 2014 at 12:54:46PM -0700, Junio C Hamano wrote:
> >> "Michael S. Tsirkin" writes:
> >>
> >> > The hash used is most
Does it work? I am not sure.
Signed-off-by: Michael S. Tsirkin
---
t/t9001-send-email.sh | 16
1 file changed, 16 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 3119c8c..3b17884 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
Allow extracting To/Cc addresses from cover letter.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-send-email.txt | 12
git-send-email.perl | 16
2 files changed, 28 insertions(+)
diff --git a/Documentation/git-send-email.txt b/Documentation
I always want my diffs to show header files first,
then .c files, then the rest. Make it possible to
set orderfile though a config option to achieve this.
Signed-off-by: Michael S. Tsirkin
---
diff.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/diff.c b/diff.c
index b79432b..6bcb26b
ff-by: Michael S. Tsirkin
---
builtin/patch-id.c | 94 --
1 file changed, 78 insertions(+), 16 deletions(-)
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 3cfe02d..e154405 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@
Clarify that patch ID can now be a sum of hashes, not a hash.
Document how command line and config options affect the
behaviour.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-patch-id.txt | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a
Verify that patch ID supports an algorithm
that is stable against diff split and reordering.
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 140 +++-
1 file changed, 129 insertions(+), 11 deletions(-)
diff --git a/t/t4204-patch-id.sh
The test is very basic and can be extended.
Couldn't find a good existing place to put it,
so created a new file.
Signed-off-by: Michael S. Tsirkin
---
t/t4056-diff-order.sh | 63 +++
1 file changed, 63 insertions(+)
create mode 100755 t/
As suggested by Junio.
Signed-off-by: Michael S. Tsirkin
---
t/test-lib-functions.sh | 7 +++
1 file changed, 7 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index aeae3ca..2fa6453 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -712,6
On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote:
> Are these three patches the same as what has been queued on
> mt/patch-id-stable topic and cooking in 'next' for a few weeks?
Not exactly - at your request I implemented git config
options to control patch id behaviour.
Documentatio
On Wed, Apr 23, 2014 at 10:34:30AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > As suggested by Junio.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
>
> Ehh, I would probably not suggest such an impl
On Wed, Apr 23, 2014 at 10:38:07AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > The test is very basic and can be extended.
> > Couldn't find a good existing place to put it,
> > so created a new file.
> >
> > Signed-of
On Wed, Apr 23, 2014 at 03:05:42PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote:
> >> Are these three patches the same as what has been queued on
> >> mt/patch-id-stab
update test to match behaviour change
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index cd13e8e..03f91ce 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
Update documentation to match behaviour change.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-patch-id.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index e21b79b..9299b90 100644
--- a
Clarify that patch ID can now be a sum of hashes, not a hash.
Document how command line and config options affect the
behaviour.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-patch-id.txt | 23 ++-
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a
Verify that patch ID supports an algorithm
that is stable against diff split and reordering.
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 128 +++-
1 file changed, 117 insertions(+), 11 deletions(-)
diff --git a/t/t4204-patch-id.sh
n two places).
The new behaviour is enabled
- when patchid.stable is true
- when --stable flag is present
Using a new flag --unstable or setting patchid.stable to false force
the historical behaviour.
Signed-off-by: Michael S. Tsirkin
---
builtin/patch-id.c
API and implementation as suggested by Junio.
Signed-off-by: Michael S. Tsirkin
---
t/test-lib-functions.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index aeae3ca..0e21275 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib
--stable has been the default in 'next' for a few weeks with no ill
effects.
Change the default to that so that users don't have to remember to
enable it.
Signed-off-by: Michael S. Tsirkin
---
builtin/patch-id.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff
I always want my diffs to show header files first,
then .c files, then the rest. Make it possible to
set orderfile though a config option to achieve this.
Signed-off-by: Michael S. Tsirkin
---
diff.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/diff.c b/diff.c
index b79432b..6bcb26b
The test is very basic and can be extended.
Couldn't find a good existing place to put it,
so created a new file.
Signed-off-by: Michael S. Tsirkin
---
t/t4056-diff-order.sh | 63 +++
1 file changed, 63 insertions(+)
create mode 100755 t/
On Thu, Apr 24, 2014 at 10:33:25AM -0700, Jonathan Nieder wrote:
> Michael S. Tsirkin wrote:
>
> > Documentation/git-patch-id.txt | 23 ++-
> > 1 file changed, 18 insertions(+), 5 deletions(-)
>
> Ah, there's the documentation. Please sq
On Thu, Apr 24, 2014 at 10:30:44AM -0700, Jonathan Nieder wrote:
> Hi,
>
> Michael S. Tsirkin wrote:
>
> > Patch id changes if users
> > 1. reorder file diffs that make up a patch
> > or
> > 2. split a patch up to multiple diffs that touch the same path
>
On Thu, Apr 24, 2014 at 11:45:35AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > The test is very basic and can be extended.
> > Couldn't find a good existing place to put it,
> > so created a new file.
> >
> > Signed-of
API and implementation as suggested by Junio.
Signed-off-by: Michael S. Tsirkin
---
t/README| 22 ++
t/test-lib-functions.sh | 5 +
2 files changed, 27 insertions(+)
diff --git a/t/README b/t/README
index caeeb9d..2d6232f 100644
--- a/t/README
+++ b/t
ation, clarify that patch ID can now be a sum of hashes,
not a hash.
Document how command line and config options affect the
behaviour.
Signed-off-by: Michael S. Tsirkin
---
builtin/patch-id.c | 74 +-
Documentation/git-patch-id.txt
Verify that patch ID supports an algorithm
that is stable against diff split and reordering.
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 102 ++--
1 file changed, 91 insertions(+), 11 deletions(-)
diff --git a/t/t4204-patch-id.sh
--stable has been the default in 'next' for a few weeks with no ill
effects.
Change the default to that so that users don't have to remember to
enable it.
Update documentation to match behaviour change.
Signed-off-by: Michael S. Tsirkin
---
builtin/patch-id.c
update test to match behaviour change
Signed-off-by: Michael S. Tsirkin
---
t/t4204-patch-id.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index 7732370..a8b0c2c 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
On Thu, Apr 24, 2014 at 03:12:14PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> >> > +--unstable::
> >> > +Use a non-symmetrical sum of hashes, such that reordering
> >>
> >> What is a non-symmetrical sum?
>
Add tests for the new feature.
Signed-off-by: Michael S. Tsirkin
---
t/t9001-send-email.sh | 45 +
1 file changed, 45 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1ecdacb..97cc094 100755
--- a/t/t9001-send-email.sh
Allow extracting To/Cc addresses from cover letter.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-send-email.txt | 12
git-send-email.perl | 16
2 files changed, 28 insertions(+)
diff --git a/Documentation/git-send-email.txt b/Documentation
On Thu, Apr 03, 2014 at 11:31:51AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Allow extracting To/Cc addresses from cover letter.
>
> Please say what you are doing with what you extract, which is the
> more important part of the objectiv
Allow extracting To/Cc addresses from the first patch
(typically the cover letter), and use them as To/Cc addresses of the
remainder of the series.
Signed-off-by: Michael S. Tsirkin
---
Documentation/git-send-email.txt | 12
git-send-email.perl | 16
2
Add tests for the new feature.
Signed-off-by: Michael S. Tsirkin
---
t/t9001-send-email.sh | 45 +
1 file changed, 45 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1ecdacb..97cc094 100755
--- a/t/t9001-send-email.sh
On Tue, Apr 29, 2014 at 12:01:10PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > Add tests for the new feature.
> >
> > Signed-off-by: Michael S. Tsirkin
> > ---
> > t/t9001-send-email.sh | 45 ++
On Mon, May 05, 2014 at 04:51:43PM -0700, Jonathan Nieder wrote:
> test_write_lines carefully quotes its arguments as "$@", so
>
> test_write_lines "a b" c
>
> writes two lines as requested, not three.
>
> Signed-off-by: Jonathan Nieder
looks like pull requests with signed git got broken in git master:
[mst@robin qemu]$ /usr/bin/git --version
git version 1.8.3.1
[mst@robin qemu]$ git --version
git version 2.0.0.rc1.18.gac53fc6.dirty
[mst@robin qemu]$
[mst@robin qemu]$ /usr/bin/git request-pull origin/master
git://git.kernel.org
On Thu, May 15, 2014 at 12:13:18PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > "Michael S. Tsirkin" writes:
> >
> >> looks like pull requests with signed git got broken in git master:
> >>
> >> [mst@robin qemu]$ /usr/bin
he change in behaviour is because one of
my pull requests got bounced because of it:
http://article.gmane.org/gmane.comp.emulators.qemu/273121
> Signed-off-by: Junio C Hamano
Tested-by: Michael S. Tsirkin
> ---
>
> * I _think_ the fix, without breaking the spirit of Linus's "I do
There's some special code in rebase -i to deal
with --keep-empty.
Add test for this combination.
Signed-off-by: Michael S. Tsirkin
---
t/t3404-rebase-interactive.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
1 - 100 of 216 matches
Mail list logo
