From 060fe5718455828b2ce5721d26be6399d782e415 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 11 Sep 2007 19:16:51 +0100 Subject: [PATCH 1/4] Fix a test failure (t9500-*.sh) on cygwin On filesystems where it is appropriate to set core.filemode to false, test 29 ("commitdiff(0): mode change") fails when git-commit does not notice a file (execute) permission change. A fix requires noting the new file execute permission in the index with a "git update-index --chmod=+x", prior to the commit. Add a function (note_chmod) which implements this idea, and insert a call in each test that modifies the x permission. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- t/t9500-gitweb-standalone-no-errors.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index fa32598b0c..642b836d64 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -58,6 +58,14 @@ gitweb_run () { # gitweb.log is left for debugging } +safe_chmod () { + chmod "$1" "$2" && + if [ "$(git config --get core.filemode)" = false ] + then + git update-index --chmod="$1" "$2" + fi +} + . ./test-lib.sh perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { @@ -229,7 +237,7 @@ test_debug 'cat gitweb.log' test_expect_success \ 'commitdiff(0): mode change' \ - 'chmod a+x new_file && + 'safe_chmod +x new_file && git commit -a -m "Mode changed." && gitweb_run "p=.git;a=commitdiff"' test_debug 'cat gitweb.log' @@ -268,7 +276,7 @@ test_debug 'cat gitweb.log' test_expect_success \ 'commitdiff(0): mode change and modified' \ 'echo "New line" >> file2 && - chmod a+x file2 && + safe_chmod +x file2 && git commit -a -m "Mode change and modification." && gitweb_run "p=.git;a=commitdiff"' test_debug 'cat gitweb.log' @@ -295,7 +303,7 @@ test_expect_success \ 'commitdiff(0): renamed, mode change and modified' \ 'git mv file3 file2 && echo "Propter nomen suum." >> file2 && - chmod a+x file2 && + safe_chmod +x file2 && git commit -a -m "File rename, mode change and modification." && gitweb_run "p=.git;a=commitdiff"' test_debug 'cat gitweb.log' @@ -412,10 +420,10 @@ test_expect_success \ git add 03-new && git mv 04-rename-from 04-rename-to && echo "Changed" >> 04-rename-to && - chmod a+x 05-mode-change && + safe_chmod +x 05-mode-change && rm -f 06-file-or-symlink && ln -s 01-change 06-file-or-symlink && echo "Changed and have mode changed" > 07-change-mode-change && - chmod a+x 07-change-mode-change && + safe_chmod +x 07-change-mode-change && git commit -a -m "Large commit" && git checkout master' From 3803bceae84fe122eccb49e3096abead508cde8f Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 12 Sep 2007 07:53:45 +0200 Subject: [PATCH 2/4] git-send-email.perl: Add angle brackets to In-Reply-To if necessary Although message-id by defintion should have surrounding angle brackets, there is no point forcing people to type them in. Signed-off-by: David Kastrup Signed-off-by: Junio C Hamano --- git-send-email.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index e0b7d1245e..195fe6f70a 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -317,7 +317,8 @@ if ($thread && !defined $initial_reply_to && $prompting) { } while (!defined $_); $initial_reply_to = $_; - $initial_reply_to =~ s/(^\s+|\s+$)//g; + $initial_reply_to =~ s/^\s+?\s+$/>/; } if (!$smtp_server) { From 4fb5fd5d301ee53882a3c2ed717c5a9fd6dc0506 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 12 Sep 2007 20:14:22 +0400 Subject: [PATCH 3/4] git-commit: Disallow amend if it is going to produce an empty non-merge commit Right now one can amend the last non-merge commit using a dirty index and in the process maybe cause the last commit to have the same tree as its parent. In such a case one would want to discard the last commit instead of amending it. This reverts commit 8588452ceb78b1da17652ba03f9942ef740e07ea. Signed-off-by: Dmitry V. Levin Signed-off-by: Junio C Hamano --- git-commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-commit.sh b/git-commit.sh index 1d04f1ff31..41538f16e5 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -554,7 +554,7 @@ else # we need to check if there is anything to commit run_status >/dev/null fi -if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ] +if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ] then rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" use_status_color=t From 6143fa2c9cc74023bab3279764cd6158b1227359 Mon Sep 17 00:00:00 2001 From: Jean-Luc Herren Date: Wed, 12 Sep 2007 20:45:03 +0200 Subject: [PATCH 4/4] stash: end index commit log with a newline There was no newline at the end of the index commit message, putting the shell prompt at its end after a 'git cat-file commit $id'. This is similar to what was fixed in 843103d69388a5c74ed99753e1c162a66835b04d. Signed-off-by: Jean-Luc Herren Signed-off-by: Junio C Hamano --- git-stash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-stash.sh b/git-stash.sh index 30425ce6df..7ba61625ba 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -57,7 +57,7 @@ save_stash () { # state of the index i_tree=$(git write-tree) && - i_commit=$(printf 'index on %s' "$msg" | + i_commit=$(printf 'index on %s\n' "$msg" | git commit-tree $i_tree -p $b_commit) || die "Cannot save the current index state"