From 8b5900751a5f19257dc9570dd195aaac46528599 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Sunkara Date: Sun, 17 Jul 2011 03:25:52 +0530 Subject: [PATCH 1/6] git-config: Remove extra whitespaces Remove extra whitespaces introduced by commits 01ebb9dc and fc1905bb Signed-off-by: Pavan Kumar Sunkara Signed-off-by: Junio C Hamano --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index e0b3b80d92..113723bf3b 100644 --- a/config.c +++ b/config.c @@ -1479,10 +1479,10 @@ int git_config_rename_section(const char *old_name, const char *new_name) } } fclose(config_file); - unlock_and_out: +unlock_and_out: if (commit_lock_file(lock) < 0) ret = error("could not commit config file %s", config_filename); - out: +out: free(config_filename); return ret; } From 6e8e67f3071ecdc139f6a77f90afee50b5ec1664 Mon Sep 17 00:00:00 2001 From: Julian Phillips Date: Sat, 16 Jul 2011 19:23:51 +0100 Subject: [PATCH 2/6] remote-curl: Add a format check to parsing of info/refs When parsing info/refs, no checks were applied that the file was in the requried format. Since the file is read from a remote webserver, this isn't guarenteed to be true. Add a check that the file at least only contains lines that consist of 40 characters followed by a tab and then the ref name. Signed-off-by: Julian Phillips Signed-off-by: Junio C Hamano --- remote-curl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/remote-curl.c b/remote-curl.c index b5be25ce96..8ac5028343 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -227,6 +227,8 @@ static struct ref *parse_info_refs(struct discovery *heads) if (data[i] == '\t') mid = &data[i]; if (data[i] == '\n') { + if (mid - start != 40) + die("%sinfo/refs not valid: is this a git repository?", url); data[i] = 0; ref_name = mid + 1; ref = xmalloc(sizeof(struct ref) + From 0dc310e8608c05f40be3390607f301ffc4284e6d Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 21 Jul 2011 16:10:52 +0100 Subject: [PATCH 3/6] Documentation: git-filter-branch honors replacement refs Make it clear that git-filter-branch will honor and make permanent replacement refs as well as grafts. Signed-off-by: Peter Collingbourne Signed-off-by: Junio C Hamano --- Documentation/git-filter-branch.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 9dc1f2a947..0f2f117383 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -32,8 +32,9 @@ changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some git bugs or such, therefore such a usage is permitted. -*NOTE*: This command honors `.git/info/grafts`. If you have any grafts -defined, running this command will make them permanent. +*NOTE*: This command honors `.git/info/grafts` and `.git/refs/replace/`. +If you have any grafts or replacement refs defined, running this command +will make them permanent. *WARNING*! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not From df6b0cad5f2d2f1984d1538de03e1e8ac87a78a2 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 21 Jul 2011 20:33:15 -0500 Subject: [PATCH 4/6] Documentation: minor grammatical fix in rev-list-options.txt Signed-off-by: Jack Nagel Signed-off-by: Junio C Hamano --- Documentation/rev-list-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 7e7ba68781..62340a5e4c 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -272,7 +272,7 @@ Default mode:: --full-history:: - As the default mode but does not prune some history. + Same as the default mode, but does not prune some history. --dense:: From b421812b487da44b01773ef38789db1122bec61a Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Wed, 13 Jul 2011 23:10:53 +0600 Subject: [PATCH 5/6] doc/fast-import: clarify notemodify command The "notemodify" fast-import command was introduced in commit a8dd2e7 (fast-import: Add support for importing commit notes, 2009-10-09) The commit log has slightly different description than the added documentation. The latter is somewhat confusing. "notemodify" is a subcommand of "commit" command used to add a note for some commit. Does this note annotate the commit produced by the "commit" command or a commit given by it's committish parameter? Which notes tree does it write notes to? The exact meaning could be deduced with old description and some notes machinery knowledge. But let's make it more obvious. This command is used in a context like "commit refs/notes/test" to add or rewrite an annotation for a committish parameter. So the advised way to add notes in a fast-import stream is: 1) import some commits (optional) 2) prepare a "commit" to the notes tree: 2.1) choose notes ref, committer, log message, etc. 2.2) create annotations with "notemodify", where each can refer to a commit being annotated via a branch name, import mark reference, sha1 and other expressions specified in the Documentation. Signed-off-by: Dmitry Ivankov Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-fast-import.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 249249aac7..3f5b9126b1 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -648,9 +648,14 @@ paths for a commit are encouraged to do so. `notemodify` ^^^^^^^^^^^^ -Included in a `commit` command to add a new note (annotating a given -commit) or change the content of an existing note. This command has -two different means of specifying the content of the note. +Included in a `commit` `` command to add a new note +annotating a `` or change this annotation contents. +Internally it is similar to filemodify 100644 on `` +path (maybe split into subdirectories). It's not advised to +use any other commands to write to the `` tree except +`filedeleteall` to delete all existing notes in this tree. +This command has two different means of specifying the content +of the note. External data format:: The data content for the note was already supplied by a prior From 5c2f84599c59527ee47a41c05956fa1f8d0704ec Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 22 Jul 2011 15:32:03 -0700 Subject: [PATCH 6/6] Update draft release notes to 1.7.7 The third batch. Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.7.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/1.7.7.txt b/Documentation/RelNotes/1.7.7.txt index 42982e5b24..6d3bfd1968 100644 --- a/Documentation/RelNotes/1.7.7.txt +++ b/Documentation/RelNotes/1.7.7.txt @@ -26,12 +26,19 @@ Updates since v1.7.6 * "git diff --stat" learned --stat-count option to limit the output of diffstat report. + * "git fetch", "git push" and friends no longer show connection + errors for addresses that couldn't be connected when at least one + address succeeds (this is arguably a regression but a deliberate + one). + * "git grep" learned --break and --heading options, to let users mimic output format of "ack". * "git rebase master topci" no longer spews usage hints after giving "fatal: no such branch: topci" error message. + * "git stash" learned --include-untracked option. + * "git submodule update" used to stop at the first error updating a submodule; it now goes on to update other submodules that can be updated, and reports the ones with errors at the end. @@ -52,6 +59,10 @@ Fixes since v1.7.6 Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are included in this release. + * "git checkout -b " sometimes wrote a bogus reflog entry, + causing later "git checkout -" fail. + (merge 71ee7fd jc/checkout-reflog-fix~1 later). + * "git diff --cc" learned to correctly ignore binary files. (merge 0508fe5 jk/combine-diff-binary-etc later) @@ -61,6 +72,10 @@ included in this release. * "git rebase -i -p" incorrectly dropped commits from side branches. (merge 12bf828 aw/rebase-i-p later) + * "git submodule add" did not allow a relative repository path when + the superproject did not have any default remote url. + (merge f22a17e8 jl/submodule-add-relurl-wo-upstream later) + * "git submodule foreach" failed to correctly give the standard input to the user-supplied command it invoked. (merge 4dca1aa bc/submodule-foreach-stdin-fix-1.7.4 later) @@ -77,7 +92,7 @@ included in this release. -- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.6-232-gd907bf8 +O=v1.7.6-344-g22f4128 git log --first-parent --oneline $O..master echo git shortlog --no-merges ^maint ^$O master