undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2011-07-22 13:58:46 -07:00
commit ed16d0dbf1
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/git-fast-import.txt
View File

@ -648,9 +648,14 @@ paths for a commit are encouraged to do so.
`notemodify` `notemodify`
^^^^^^^^^^^^ ^^^^^^^^^^^^
Included in a `commit` command to add a new note (annotating a given Included in a `commit` `<notes_ref>` command to add a new note
commit) or change the content of an existing note. This command has annotating a `<committish>` or change this annotation contents.
two different means of specifying the content of the note. 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:: External data format::
The data content for the note was already supplied by a prior The data content for the note was already supplied by a prior

5
Documentation/git-filter-branch.txt
View File

@ -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, useful in the future for compensating for some git bugs or such,
therefore such a usage is permitted. therefore such a usage is permitted.
*NOTE*: This command honors `.git/info/grafts`. If you have any grafts *NOTE*: This command honors `.git/info/grafts` and `.git/refs/replace/`.
defined, running this command will make them permanent. 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 *WARNING*! The rewritten history will have different object names for all
the objects and will not converge with the original branch. You will not the objects and will not converge with the original branch. You will not

2
Documentation/rev-list-options.txt
View File

@ -272,7 +272,7 @@ Default mode::
--full-history:: --full-history::
As the default mode but does not prune some history. Same as the default mode, but does not prune some history.
--dense:: --dense::

4
config.c
View File

@ -1499,10 +1499,10 @@ int git_config_rename_section(const char *old_name, const char *new_name)
} }
} }
fclose(config_file); fclose(config_file);
unlock_and_out: unlock_and_out:
if (commit_lock_file(lock) < 0) if (commit_lock_file(lock) < 0)
ret = error("could not commit config file %s", config_filename); ret = error("could not commit config file %s", config_filename);
out: out:
free(config_filename); free(config_filename);
return ret; return ret;
} }

2
remote-curl.c
View File

@ -227,6 +227,8 @@ static struct ref *parse_info_refs(struct discovery *heads)
if (data[i] == '\t') if (data[i] == '\t')
mid = &data[i]; mid = &data[i];
if (data[i] == '\n') { if (data[i] == '\n') {
if (mid - start != 40)
die("%sinfo/refs not valid: is this a git repository?", url);
data[i] = 0; data[i] = 0;
ref_name = mid + 1; ref_name = mid + 1;
ref = xmalloc(sizeof(struct ref) + ref = xmalloc(sizeof(struct ref) +