Sorry, I accidentally replied to the v1 of this patch...
On Tue, May 13, 2014 at 05:33:21PM -0400, Jeff Sipek wrote:
> On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote:
> > git branch names can contain commas. Check that "guilt graph" works
> > even in that case.
> >
> > Signed-off-by: Per Cederqvist <[email protected]>
> > ---
> > regression/t-033.out | 62
> > ++++++++++++++++++++++++++++++++++++++++++++++++++++
> > regression/t-033.sh | 37 +++++++++++++++++++++++++++++++
> > 2 files changed, 99 insertions(+)
> >
> > diff --git a/regression/t-033.out b/regression/t-033.out
> > index 76613f9..e638d7b 100644
> > --- a/regression/t-033.out
> > +++ b/regression/t-033.out
> > @@ -1,3 +1,65 @@
> > % setup_repo
> > % guilt graph
> > No patch applied.
> > +% git checkout -b a,graph master
> > +Switched to a new branch 'a,graph'
> > +% guilt init
> > +% guilt new a.patch
> > +% guilt pop
> > +All patches popped.
> > +% guilt push
> > +Applying patch..a.patch
> > +Patch applied.
> > +% guilt graph
> > +digraph G {
> > +# checking rev 95275d7c05c6a6176d3941374115b91272877f6c
> > + "95275d7c05c6a6176d3941374115b91272877f6c" [label="a.patch"]
> > +}
> > +% git add file.txt
> > +% guilt refresh
> > +Patch a.patch refreshed
> > +% guilt pop
> > +All patches popped.
> > +% guilt push
> > +Applying patch..a.patch
> > +Patch applied.
> > +% guilt graph
> > +digraph G {
> > +# checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
> > + "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
> > +}
> > +% guilt new b.patch
> > +% git add file2.txt
> > +% guilt refresh
> > +Patch b.patch refreshed
> > +% guilt pop
> > +Now at a.patch.
> > +% guilt push
> > +Applying patch..b.patch
> > +Patch applied.
> > +% guilt graph
> > +digraph G {
> > +# checking rev c7014443c33d2b0237293687ceb9cbd38313df65
> > + "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
> > +# checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
> > + "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
> > +}
> > +% guilt new c.patch
> > +% git add file.txt
> > +% guilt refresh
> > +Patch c.patch refreshed
> > +% guilt pop
> > +Now at b.patch.
> > +% guilt push
> > +Applying patch..c.patch
> > +Patch applied.
> > +% guilt graph
> > +digraph G {
> > +# checking rev 891bc14b5603474c9743fd04f3da888644413dc5
> > + "891bc14b5603474c9743fd04f3da888644413dc5" [label="c.patch"]
> > +# checking rev c7014443c33d2b0237293687ceb9cbd38313df65
> > + "c7014443c33d2b0237293687ceb9cbd38313df65" [label="b.patch"]
> > +# checking rev ff2775f8d1dc753f635830adcc3a067e0b681e2d
> > + "ff2775f8d1dc753f635830adcc3a067e0b681e2d" [label="a.patch"]
> > + "891bc14b5603474c9743fd04f3da888644413dc5" ->
> > "ff2775f8d1dc753f635830adcc3a067e0b681e2d"; // ?
> > +}
> > diff --git a/regression/t-033.sh b/regression/t-033.sh
> > index ae40577..57dce78 100755
> > --- a/regression/t-033.sh
> > +++ b/regression/t-033.sh
> > @@ -3,9 +3,46 @@
> > # Test the graph code
> > #
> >
> > +function fixup_time_info
> > +{
> > + cmd guilt pop
> > + touch -a -m -t "$TOUCH_DATE" ".git/patches/a,graph/$1"
> > + cmd guilt push
> > +}
> > +
> > source "$REG_DIR/scaffold"
> >
> > cmd setup_repo
> >
>
> A comment here to justify this seemingly useless guilt-graph call? Maybe
> adding one of the '%%' lines between each section. Otherwise, this looks
> good.
>
> > shouldfail guilt graph
> >
> > +cmd git checkout -b a,graph master
> > +
> > +cmd guilt init
> > +
> > +cmd guilt new a.patch
> > +
> > +fixup_time_info a.patch
> > +cmd guilt graph
> > +
> > +cmd echo a >> file.txt
> > +cmd git add file.txt
> > +cmd guilt refresh
> > +fixup_time_info a.patch
> > +cmd guilt graph
> > +
> > +# An unrelated file. No deps.
> > +cmd guilt new b.patch
> > +cmd echo b >> file2.txt
> > +cmd git add file2.txt
> > +cmd guilt refresh
> > +fixup_time_info b.patch
> > +cmd guilt graph
> > +
> > +# An change to an old file. Should add a dependency.
> > +cmd guilt new c.patch
> > +cmd echo c >> file.txt
> > +cmd git add file.txt
> > +cmd guilt refresh
> > +fixup_time_info c.patch
> > +cmd guilt graph
> > --
> > 1.8.3.1
> >
>
> --
> Ready; T=0.01/0.01 17:32:39
--
C is quirky, flawed, and an enormous success.
- Dennis M. Ritchie.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
