summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-22 20:58:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-22 20:58:46 (GMT)
commited16d0dbf11128e1f92b39a373a83442fa6d5051 (patch)
treeec11c9895bce0bc27018d55baf4d3f5fd5bd17c4
parentd79bcd68056250d7c03bf9b12728ee2fd85a0ab3 (diff)
parentb421812b487da44b01773ef38789db1122bec61a (diff)
downloadgit-ed16d0dbf11128e1f92b39a373a83442fa6d5051.zip
git-ed16d0dbf11128e1f92b39a373a83442fa6d5051.tar.gz
git-ed16d0dbf11128e1f92b39a373a83442fa6d5051.tar.bz2
Merge branch 'maint'
* maint: doc/fast-import: clarify notemodify command Documentation: minor grammatical fix in rev-list-options.txt Documentation: git-filter-branch honors replacement refs remote-curl: Add a format check to parsing of info/refs git-config: Remove extra whitespaces
-rw-r--r--Documentation/git-fast-import.txt11
-rw-r--r--Documentation/git-filter-branch.txt5
-rw-r--r--Documentation/rev-list-options.txt2
-rw-r--r--config.c4
-rw-r--r--remote-curl.c2
5 files changed, 16 insertions, 8 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 249249a..3f5b912 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` `<notes_ref>` command to add a new note
+annotating a `<committish>` or change this annotation contents.
+Internally it is similar to filemodify 100644 on `<committish>`
+path (maybe split into subdirectories). It's not advised to
+use any other commands to write to the `<notes_ref>` 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
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 9dc1f2a..0f2f117 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
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 554ab8c..39e6207 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::
diff --git a/config.c b/config.c
index 6b61a84..e42c59b 100644
--- a/config.c
+++ b/config.c
@@ -1499,10 +1499,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;
}
diff --git a/remote-curl.c b/remote-curl.c
index faaeda4..69831e9 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) +