From 97afde15f58728138f8e178b2acb7c72473f7d96 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 26 Apr 2012 00:53:59 -0500 Subject: [PATCH 1/3] bundle: remove stray single-quote from error message After running rev-list --boundary to retrieve the list of boundary commits, "git bundle create" runs its own revision walk. If in this stage git encounters an unfamiliar option, it writes a message with an unbalanced quotation mark: error: unrecognized argument: --foo' Drop the stray quote to match the "unrecognized argument: %s" message used elsewhere and save translators some work. This is mostly a futureproofing measure: for now, the "rev-list --boundary" command catches most strange arguments on its own and the above message is not seen unless you try something esoteric like "git bundle create test.bundle --header HEAD". Reported-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- bundle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.c b/bundle.c index 6bf849740c..5364cbfa0f 100644 --- a/bundle.c +++ b/bundle.c @@ -256,7 +256,7 @@ int create_bundle(struct bundle_header *header, const char *path, argc = setup_revisions(argc, argv, &revs, NULL); if (argc > 1) - return error("unrecognized argument: %s'", argv[1]); + return error("unrecognized argument: %s", argv[1]); object_array_remove_duplicates(&revs.pending); From 8258858493ad3504630c3bfa7dfde61df811994a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Apr 2012 09:41:52 -0700 Subject: [PATCH 2/3] Git 1.7.7.7 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.7.7.txt | 13 +++++++++++++ Documentation/git.txt | 4 +++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.7.7.txt diff --git a/Documentation/RelNotes/1.7.7.7.txt b/Documentation/RelNotes/1.7.7.7.txt new file mode 100644 index 0000000000..e79118d063 --- /dev/null +++ b/Documentation/RelNotes/1.7.7.7.txt @@ -0,0 +1,13 @@ +Git v1.7.7.7 Release Notes +========================== + +Fixes since v1.7.7.6 +-------------------- + + * An error message from 'git bundle' had an unmatched single quote pair in it. + + * 'git diff --histogram' option was not described. + + * 'git imap-send' carried an unused dead code. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index 6803e1309f..9c3e51c4b9 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.7.5/git.html[documentation for release 1.7.7.5] +* link:v1.7.7.7/git.html[documentation for release 1.7.7.7] * release notes for + link:RelNotes/1.7.7.7.txt[1.7.7.7], + link:RelNotes/1.7.7.6.txt[1.7.7.6], link:RelNotes/1.7.7.5.txt[1.7.7.5], link:RelNotes/1.7.7.4.txt[1.7.7.4], link:RelNotes/1.7.7.3.txt[1.7.7.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2feae58821..0b68ab8881 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.7.6 +DEF_VER=v1.7.7.7 LF=' ' diff --git a/RelNotes b/RelNotes index 472b95854b..81eb3c2271 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.7.6.txt \ No newline at end of file +Documentation/RelNotes/1.7.7.7.txt \ No newline at end of file From d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Apr 2012 09:59:22 -0700 Subject: [PATCH 3/3] Git 1.7.8.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.6.txt | 22 ++++++++++++++++++++++ Documentation/git.txt | 4 +++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.8.6.txt diff --git a/Documentation/RelNotes/1.7.8.6.txt b/Documentation/RelNotes/1.7.8.6.txt new file mode 100644 index 0000000000..d9bf2b741a --- /dev/null +++ b/Documentation/RelNotes/1.7.8.6.txt @@ -0,0 +1,22 @@ +Git v1.7.8.6 Release Notes +========================== + +Fixes since v1.7.8.5 +-------------------- + + * An error message from 'git bundle' had an unmatched single quote pair in it. + + * 'git diff --histogram' option was not described. + + * Documentation for 'git rev-list' had minor formatting errors. + + * 'git imap-send' carried an unused dead code. + + * The way 'git fetch' implemented its connectivity check over + received objects was overly pessimistic, and wasted a lot of + cycles. + + * Various minor backports of fixes from the 'master' and the 'maint' + branch. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index e71a0d1d32..16528492df 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.8.4/git.html[documentation for release 1.7.8.4] +* link:v1.7.8.6/git.html[documentation for release 1.7.8.6] * release notes for + link:RelNotes/1.7.8.6.txt[1.7.8.6], + link:RelNotes/1.7.8.5.txt[1.7.8.5], link:RelNotes/1.7.8.4.txt[1.7.8.4], link:RelNotes/1.7.8.3.txt[1.7.8.3], link:RelNotes/1.7.8.2.txt[1.7.8.2], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c95c200eeb..fe43c5a309 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8.5 +DEF_VER=v1.7.8.6 LF=' ' diff --git a/RelNotes b/RelNotes index dfc0e738d9..b5c2795d47 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.8.5.txt \ No newline at end of file +Documentation/RelNotes/1.7.8.6.txt \ No newline at end of file