2005-10-13 18:36:37 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Test git-rev-parse with different parent options'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
echo "Hello World" > hello
|
|
|
|
|
echo "Silly example" > example
|
|
|
|
|
|
|
|
|
|
git-update-index --add hello example
|
|
|
|
|
|
|
|
|
|
test_expect_success 'blob' "test blob = \"$(git-cat-file -t 557db03)\""
|
|
|
|
|
|
|
|
|
|
test_expect_success 'blob 557db03' "test \"Hello World\" = \"$(git-cat-file blob 557db03)\""
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
git-diff-files -p > diff.output
|
|
|
|
|
test_expect_success 'git-diff-files -p' 'cmp diff.expect diff.output'
|
|
|
|
|
git diff > diff.output
|
|
|
|
|
test_expect_success 'git diff' 'cmp diff.expect diff.output'
|
|
|
|
|
|
|
|
|
|
tree=$(git-write-tree 2>/dev/null)
|
|
|
|
|
|
|
|
|
|
test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
|
|
|
|
|
|
|
|
|
|
output="$(echo "Initial commit" | git-commit-tree $(git-write-tree) 2>&1 > .git/refs/heads/master)"
|
|
|
|
|
|
|
|
|
|
test_expect_success 'commit' "test 'Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb' = \"$output\""
|
|
|
|
|
|
|
|
|
|
git-diff-index -p HEAD > diff.output
|
|
|
|
|
test_expect_success 'git-diff-index -p HEAD' 'cmp diff.expect diff.output'
|
|
|
|
|
|
|
|
|
|
git diff HEAD > diff.output
|
|
|
|
|
test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
|
|
|
|
|
|
|
|
|
|
#rm hello
|
|
|
|
|
#test_expect_success 'git-read-tree --reset HEAD' "git-read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git-update-index --refresh)\""
|
|
|
|
|
|
|
|
|
|
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 18:59:32 +00:00
|
|
|
commit VARIABLE
|
2005-10-13 18:36:37 +00: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
|
|
|
|
|
|
|
|
|
|
git-whatchanged -p --root | \
|
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 18:59:32 +00:00
|
|
|
sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
|
2005-10-13 18:36:37 +00:00
|
|
|
-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
|
|
|
|
|
> whatchanged.output
|
|
|
|
|
test_expect_success 'git-whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
|
|
|
|
|
|
|
|
|
|
git tag my-first-tag
|
|
|
|
|
test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
|
|
|
|
|
|
|
|
|
|
# TODO: test git-clone
|
|
|
|
|
|
|
|
|
|
git checkout -b mybranch
|
|
|
|
|
test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
|
|
|
|
|
|
|
|
|
|
cat > branch.expect <<EOF
|
|
|
|
|
master
|
|
|
|
|
* mybranch
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git branch > branch.output
|
|
|
|
|
test_expect_success 'git branch' 'cmp branch.expect branch.output'
|
|
|
|
|
|
|
|
|
|
git checkout mybranch
|
|
|
|
|
echo "Work, work, work" >>hello
|
2006-02-05 08:07:44 +00:00
|
|
|
git commit -m 'Some work.' -i hello
|
2005-10-13 18:36:37 +00:00
|
|
|
|
|
|
|
|
git checkout master
|
|
|
|
|
|
|
|
|
|
echo "Play, play, play" >>hello
|
|
|
|
|
echo "Lots of fun" >>example
|
2006-02-05 08:07:44 +00:00
|
|
|
git commit -m 'Some fun.' -i hello example
|
2005-10-13 18:36:37 +00:00
|
|
|
|
|
|
|
|
test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
|
|
|
|
|
|
|
|
|
|
cat > hello << EOF
|
|
|
|
|
Hello World
|
|
|
|
|
It's a new day for git
|
|
|
|
|
Play, play, play
|
|
|
|
|
Work, work, work
|
|
|
|
|
EOF
|
|
|
|
|
|
2006-02-05 08:07:44 +00:00
|
|
|
git commit -m 'Merged "mybranch" changes.' -i hello
|
2005-10-13 18:36:37 +00:00
|
|
|
|
2006-04-20 08:20:56 +00:00
|
|
|
test_done
|
|
|
|
|
|
2005-10-13 18:36:37 +00:00
|
|
|
cat > show-branch.expect << EOF
|
|
|
|
|
* [master] Merged "mybranch" changes.
|
|
|
|
|
! [mybranch] Some work.
|
|
|
|
|
--
|
2006-01-11 22:02:38 +00:00
|
|
|
- [master] Merged "mybranch" changes.
|
|
|
|
|
*+ [mybranch] Some work.
|
2005-10-13 18:36:37 +00:00
|
|
|
EOF
|
|
|
|
|
|
2005-11-11 02:27:44 +00:00
|
|
|
git show-branch --topo-order master mybranch > show-branch.output
|
2005-10-13 18:36:37 +00:00
|
|
|
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
|
|
|
|
|
|
|
|
|
|
git checkout mybranch
|
|
|
|
|
|
|
|
|
|
cat > resolve.expect << EOF
|
2006-03-10 06:51:21 +00:00
|
|
|
Updating from VARIABLE to VARIABLE
|
2005-10-13 18:36:37 +00:00
|
|
|
example | 1 +
|
|
|
|
|
hello | 1 +
|
|
|
|
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
git resolve HEAD master "Merge upstream changes." | \
|
|
|
|
|
sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" > resolve.output
|
|
|
|
|
test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
|
|
|
|
|
|
|
|
|
|
cat > show-branch2.expect << EOF
|
|
|
|
|
! [master] Merged "mybranch" changes.
|
|
|
|
|
* [mybranch] Merged "mybranch" changes.
|
|
|
|
|
--
|
2006-01-11 22:02:38 +00:00
|
|
|
-- [master] Merged "mybranch" changes.
|
2005-10-13 18:36:37 +00:00
|
|
|
EOF
|
|
|
|
|
|
2005-11-11 02:27:44 +00:00
|
|
|
git show-branch --topo-order master mybranch > show-branch2.output
|
2005-10-13 18:36:37 +00:00
|
|
|
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
|
|
|
|
|
|
|
|
|
|
# TODO: test git fetch
|
|
|
|
|
|
|
|
|
|
# TODO: test git push
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git repack' 'git repack'
|
|
|
|
|
test_expect_success 'git prune-packed' 'git prune-packed'
|
|
|
|
|
test_expect_failure '-> only packed objects' 'find -type f .git/objects/[0-9a-f][0-9a-f]'
|
|
|
|
|
|
|
|
|
|
test_done
|
|
|
|
|
|