Skip to content

Commit

Permalink
Check that "guilt graph" works when working on a branch with a comma.
Browse files Browse the repository at this point in the history
git branch names can contain commas.  Check that "guilt graph" works
even in that case.

Signed-off-by: Per Cederqvist <[email protected]>
Signed-off-by: Josef 'Jeff' Sipek <[email protected]>
  • Loading branch information
Per Cederqvist committed Jan 22, 2015
1 parent 3520b04 commit e2e378d
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 0 deletions.
65 changes: 65 additions & 0 deletions regression/t-033.out
Original file line number Diff line number Diff line change
@@ -1,3 +1,68 @@
% setup_repo
% guilt graph
No patch applied.
%% Testing branch a,graph
% 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"]
}
%% Adding an unrelated file in a new patch. No deps.
% 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"]
}
%% Changing a file already changed in the first patch adds a dependency.
% 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"; // ?
}
39 changes: 39 additions & 0 deletions regression/t-033.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
# 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
Expand All @@ -11,3 +18,35 @@ cmd setup_repo
# message when no patches are applied. (An older version of guilt
# used to enter an endless loop in this situation.)
shouldfail guilt graph

echo "%% Testing branch a,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

echo "%% Adding an unrelated file in a new patch. 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

echo "%% Changing a file already changed in the first patch adds 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

0 comments on commit e2e378d

Please sign in to comment.