git/t/t1200-tutorial.sh at 91c7674371c101766242b52ea1880cd919cb3075 - mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00

Junio C Hamano 130fcca63f git-commit: revamp the git-commit semantics.

- "git commit" without _any_ parameter keeps the traditional
   behaviour.  It commits the current index.

   We commit the whole index even when this form is run from a
   subdirectory.

 - "git commit --include paths..." (or "git commit -i paths...")
   is equivalent to:

   	git update-index --remove paths...
        git commit

 - "git commit paths..." acquires a new semantics.  This is an
   incompatible change that needs user training, which I am
   still a bit reluctant to swallow, but enough people seem to
   have complained that it is confusing to them.  It

   1. refuses to run if $GIT_DIR/MERGE_HEAD exists, and reminds
      trained git users that the traditional semantics now needs
      -i flag.

   2. refuses to run if named paths... are different in HEAD and
      the index (ditto about reminding).  Added paths are OK.

   3. reads HEAD commit into a temporary index file.

   4. updates named paths... from the working tree in this
      temporary index.

   5. does the same updates of the paths... from the working
      tree to the real index.

   6. makes a commit using the temporary index that has the
      current HEAD as the parent, and updates the HEAD with this
      new commit.

 - "git commit --all" can run from a subdirectory, but it updates
   the index with all the modified files and does a whole tree
   commit.

 - In all cases, when the command decides not to create a new
   commit, the index is left as it was before the command is
   run.  This means that the two "git diff" in the following
   sequence:

       $ git diff
       $ git commit -a
       $ git diff

   would show the same diff if you abort the commit process by
   making the commit log message empty.

This commit also introduces much requested --author option.

	$ git commit --author 'A U Thor <author@example.com>'

Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-02-06 23:20:32 -08:00

160 lines

4.1 KiB

Bash

Executable file

Raw Blame History

 #!/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
 diff-tree VARIABLE (from root)
 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 | \
 	sed -e "1s/^\(.\{10\}\).\{40\}/\1VARIABLE/" \
 		-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
 git commit -m 'Some work.' -i hello
 git checkout master
 echo "Play, play, play" >>hello
 echo "Lots of fun" >>example
 git commit -m 'Some fun.' -i hello example
 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
 git commit -m 'Merged "mybranch" changes.' -i hello
 cat > show-branch.expect << EOF
 * [master] Merged "mybranch" changes.
  ! [mybranch] Some work.
 --
 -  [master] Merged "mybranch" changes.
 *+ [mybranch] Some work.
 EOF
 git show-branch --topo-order master mybranch > show-branch.output
 test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
 git checkout mybranch
 cat > resolve.expect << EOF
 Updating from VARIABLE to VARIABLE.
  example |    1 +
  hello   |    1 +
 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.
 --
 -- [master] Merged "mybranch" changes.
 EOF
 git show-branch --topo-order master mybranch > show-branch2.output
 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