From c4c42f2cbd2eb14871881cc0d27412b477f699a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Mon, 24 Oct 2011 15:24:51 +1100 Subject: [PATCH 1/3] Reindent closing bracket using tab instead of spaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index 9624865e21..e0a3260566 100644 --- a/wt-status.c +++ b/wt-status.c @@ -316,7 +316,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s) if (s->ignore_submodule_arg) { DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG); handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg); - } + } rev.diffopt.format_callback = wt_status_collect_changed_cb; rev.diffopt.format_callback_data = s; rev.prune_data = s->pathspec; From c14daa4845ff2ec0d27807fa50f9fac1ca4d6462 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 22 Oct 2011 19:44:40 +0200 Subject: [PATCH 2/3] make the sample pre-commit hook script reject names with newlines, too The sample pre-commit hook script would fail to reject a file name like "a\nb" because of the way newlines are handled in "$(...)". Adjust the test to count filtered bytes and require there be 0. Also print all diagnostics to standard error, not stdout, so they will actually be seen. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit.sample | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index b187c4bb1f..18c4829765 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -18,6 +18,9 @@ fi # If you want to allow non-ascii filenames set this variable to true. allownonascii=$(git config hooks.allownonascii) +# Redirect output to stderr. +exec 1>&2 + # Cross platform projects tend to avoid non-ascii filenames; prevent # them from being added to the repository. We exploit the fact that the # printable range starts at the space character and ends with tilde. @@ -25,8 +28,8 @@ if [ "$allownonascii" != "true" ] && # Note that the use of brackets around a tr range is ok here, (it's # even required, for portability to Solaris 10's /usr/bin/tr), since # the square bracket bytes happen to fall in the designated range. - test "$(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0')" + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then echo "Error: Attempt to add a non-ascii file name." echo @@ -43,4 +46,5 @@ then exit 1 fi +# If there are whitespace errors, print the offending file names and fail. exec git diff-index --check --cached $against -- From 425c771534f9f569d97d69106dc21043f812e506 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 26 Oct 2011 16:23:26 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.txt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index d7b2c76c03..3045245aa6 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -96,6 +96,9 @@ Updates since v1.7.7 * "git stash" learned "--include-untracked" option to stash away untracked/ignored cruft from the working tree. + * "git submodule clone" does not leak an error message to the UI + level unnecessarily anymore. + * "git submodule update" learned to honor "none" as the value for submodule..update to specify that the named submodule should not be checked out by default. @@ -113,6 +116,9 @@ Updates since v1.7.7 * "gitweb" leaked unescaped control characters from syntax hiliter outputs. + * "gitweb" can be told to give custom string at the end of the HTML + HEAD element. + * "gitweb" now has its own manual pages. @@ -150,6 +156,10 @@ included in this release. with too many refs were unnecessarily slow. (merge 17d68a54d jp/get-ref-dir-unsorted later to maint). + * "git fetch --prune" was unsafe when used with refspecs from the + command line. + (merge e8c1e6c cn/fetch-prune later to maint). + * Report from "git commit" on untracked files was confused under core.ignorecase option. (merge 2548183b jk/name-hash-dirent later to maint). @@ -198,9 +208,15 @@ included in this release. of a blob, when JavaScript actions are enabled. (merge 2b07ff3ff ps/gitweb-js-with-lineno later to maint). + * The logic to filter out forked projects in the project list in + "gitweb" was broken for some time. + (merge 53c632f jm/maint-gitweb-filter-forks-fix later to maint). + + + --- exec >/var/tmp/1 -O=v1.7.7-485-g9ee3d37 +O=v1.7.7.1-453-g0b26d1e echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo