2005-10-13 20:36:37 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
#
|
|
|
|
|
2006-10-03 02:02:15 +02:00
|
|
|
test_description='A simple turial in the form of a test case'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'blob' '
|
|
|
|
echo "Hello World" > hello &&
|
|
|
|
echo "Silly example" > example &&
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
git update-index --add hello example &&
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test blob = "$(git cat-file -t 557db03)"
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'blob 557db03' '
|
|
|
|
test "Hello World" = "$(git cat-file blob 557db03)"
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
echo "It's a new day for git" >>hello
|
|
|
|
cat > diff.expect << EOF
|
|
|
|
diff --git a/hello b/hello
|
|
|
|
index 557db03..263414f 100644
|
|
|
|
--- a/hello
|
|
|
|
+++ b/hello
|
|
|
|
@@ -1 +1,2 @@
|
|
|
|
Hello World
|
|
|
|
+It's a new day for git
|
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git diff-files -p' '
|
|
|
|
git diff-files -p > diff.output &&
|
|
|
|
cmp diff.expect diff.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git diff' '
|
|
|
|
git diff > diff.output &&
|
|
|
|
cmp diff.expect diff.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'tree' '
|
|
|
|
tree=$(git write-tree 2>/dev/null)
|
|
|
|
test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git diff-index -p HEAD' '
|
|
|
|
echo "Initial commit" | \
|
|
|
|
git commit-tree $(git write-tree) 2>&1 > .git/refs/heads/master &&
|
|
|
|
git diff-index -p HEAD > diff.output &&
|
|
|
|
cmp diff.expect diff.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git diff HEAD' '
|
|
|
|
git diff HEAD > diff.output &&
|
|
|
|
cmp diff.expect diff.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
cat > whatchanged.expect << EOF
|
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote:
>
> In the mid-term, I am hoping we can drop the generate_header()
> callchain _and_ the custom code that formats commit log in-core,
> found in cmd_log_wc().
Ok, this was nastier than expected, just because the dependencies between
the different log-printing stuff were absolutely _everywhere_, but here's
a patch that does exactly that.
The patch is not very easy to read, and the "--patch-with-stat" thing is
still broken (it does not call the "show_log()" thing properly for
merges). That's not a new bug. In the new world order it _should_ do
something like
if (rev->logopt)
show_log(rev, rev->logopt, "---\n");
but it doesn't. I haven't looked at the --with-stat logic, so I left it
alone.
That said, this patch removes more lines than it adds, and in particular,
the "cmd_log_wc()" loop is now a very clean:
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
so it doesn't get much prettier than this. All the complexity is entirely
hidden in log-tree.c, and any code that needs to flush the log literally
just needs to do the "if (rev->logopt) show_log(...)" incantation.
I had to make the combined_diff() logic take a "struct rev_info" instead
of just a "struct diff_options", but that part is pretty clean.
This does change "git whatchanged" from using "diff-tree" as the commit
descriptor to "commit", and I changed one of the tests to reflect that new
reality. Otherwise everything still passes, and my other tests look fine
too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-17 20:59:32 +02:00
|
|
|
commit VARIABLE
|
2005-10-13 20:36:37 +02:00
|
|
|
Author: VARIABLE
|
|
|
|
Date: VARIABLE
|
|
|
|
|
|
|
|
Initial commit
|
|
|
|
|
|
|
|
diff --git a/example b/example
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..f24c74a
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/example
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+Silly example
|
|
|
|
diff --git a/hello b/hello
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..557db03
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/hello
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+Hello World
|
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git whatchanged -p --root' '
|
|
|
|
git whatchanged -p --root | \
|
|
|
|
sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
|
2005-10-13 20:36:37 +02:00
|
|
|
-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
|
2009-11-05 07:33:52 +01:00
|
|
|
> whatchanged.output &&
|
|
|
|
cmp whatchanged.expect whatchanged.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git tag my-first-tag' '
|
|
|
|
git tag my-first-tag &&
|
|
|
|
cmp .git/refs/heads/master .git/refs/tags/my-first-tag
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git checkout -b mybranch' '
|
|
|
|
git checkout -b mybranch &&
|
|
|
|
cmp .git/refs/heads/master .git/refs/heads/mybranch
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
cat > branch.expect <<EOF
|
|
|
|
master
|
|
|
|
* mybranch
|
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git branch' '
|
|
|
|
git branch > branch.output &&
|
|
|
|
cmp branch.expect branch.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git resolve now fails' '
|
|
|
|
git checkout mybranch &&
|
|
|
|
echo "Work, work, work" >>hello &&
|
|
|
|
git commit -m "Some work." -i hello &&
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
git checkout master &&
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
echo "Play, play, play" >>hello &&
|
|
|
|
echo "Lots of fun" >>example &&
|
|
|
|
git commit -m "Some fun." -i hello example &&
|
2005-10-13 20:36:37 +02:00
|
|
|
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git merge -m "Merge work in mybranch" mybranch
|
2007-02-07 19:37:03 +01:00
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
cat > hello << EOF
|
|
|
|
Hello World
|
|
|
|
It's a new day for git
|
|
|
|
Play, play, play
|
|
|
|
Work, work, work
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat > show-branch.expect << EOF
|
|
|
|
* [master] Merged "mybranch" changes.
|
|
|
|
! [mybranch] Some work.
|
|
|
|
--
|
2006-01-11 23:02:38 +01:00
|
|
|
- [master] Merged "mybranch" changes.
|
|
|
|
*+ [mybranch] Some work.
|
2005-10-13 20:36:37 +02:00
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git show-branch' '
|
|
|
|
git commit -m "Merged \"mybranch\" changes." -i hello &&
|
|
|
|
git show-branch --topo-order master mybranch > show-branch.output &&
|
|
|
|
cmp show-branch.expect show-branch.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
cat > resolve.expect << EOF
|
2009-11-05 07:33:52 +01:00
|
|
|
Updating VARIABLE..VARIABLE
|
|
|
|
Fast forward (no commit created; -m option ignored)
|
2005-10-13 20:36:37 +02:00
|
|
|
example | 1 +
|
|
|
|
hello | 1 +
|
|
|
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git resolve' '
|
|
|
|
git checkout mybranch &&
|
|
|
|
git merge -m "Merge upstream changes." master | \
|
|
|
|
sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" >resolve.output &&
|
|
|
|
cmp resolve.expect resolve.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
cat > show-branch2.expect << EOF
|
|
|
|
! [master] Merged "mybranch" changes.
|
|
|
|
* [mybranch] Merged "mybranch" changes.
|
|
|
|
--
|
2006-01-11 23:02:38 +01:00
|
|
|
-- [master] Merged "mybranch" changes.
|
2005-10-13 20:36:37 +02:00
|
|
|
EOF
|
|
|
|
|
2009-11-05 07:33:52 +01:00
|
|
|
test_expect_success 'git show-branch (part 2)' '
|
|
|
|
git show-branch --topo-order master mybranch > show-branch2.output &&
|
|
|
|
cmp show-branch2.expect show-branch2.output
|
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
test_expect_success 'git repack' 'git repack'
|
|
|
|
test_expect_success 'git prune-packed' 'git prune-packed'
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success '-> only packed objects' '
|
2009-11-05 07:33:52 +01:00
|
|
|
git prune && # Remove conflict marked blobs
|
|
|
|
! find .git/objects/[0-9a-f][0-9a-f] -type f
|
2008-02-01 10:50:53 +01:00
|
|
|
'
|
2005-10-13 20:36:37 +02:00
|
|
|
|
|
|
|
test_done
|