Show all
Author Commit Message Date
Junio C Hamano
GIT Signed-off-by: Junio C Hamano <>
Quy Tonthat
Update RPM spec for the new location of git-cvsserver. git-cvsserver has been moved from libexecdir to bindir. Signed-off-by: Quy Tonthat <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Merge branch 'cb/maint-update-ref-fix' into maint * cb/maint-update-ref-fix: push: fix local refs update if already up-to-date do not force write of packed refs
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint * cj/maint-gitpm-fix-maybe-self: do not break inheritance
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into maint * ar/maint-mksnpath: Use git_pathdup instead of xstrdup(git_path(...)) git_pathdup: returns xstrdup-ed copy of the formatted path Fix potentially dangerous use of git_path in ref.c Add git_snpath: a .git path formatting routine with output buffer Fix potentially dangerous uses of mkpath and git_path Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c Add mksnpath which allows yo…
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref' into maint * mv/maint-branch-m-symref: update-ref --no-deref -d: handle the case when the pointed ref is packed git branch -m: forbid renaming of a symref Fix git update-ref --no-deref -d. rename_ref(): handle the case when the reflog of a ref does not exist Fix git branch -m for symrefs.
Clemens Buchacher
push: fix local refs update if already up-to-date git push normally updates local refs only after a successful push. If the remote already has the updates -- pushed indirectly through another repository, for example -- we forget to update local tracking refs. Signed-off-by: Clemens Buchacher <> Signed-off-by: Junio C Hamano <>
Clemens Buchacher
do not force write of packed refs We force writing a ref if it does not exist. Originally, we only had to look for the ref file to check if it existed. Now we have to look for a packed ref as well. Luckily, resolve_ref already does all the work for us. Signed-off-by: Clemens Buchacher <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
format-patch documentation: mention the special case of showing a single commit Even long timers seem to have missed that "format-patch -1 $commit" is a much simpler and more obvious way to say "format-patch $commit^..$commit" from the current documentation (and an example "format-patch -3 $commit" to get three patches). Add an explicit instruction in a much earlier part of the documentation to make it easier to find. Signed-off-by: Junio C Hamano <>
Yann Dirson
Add reference for status letters in documentation. Also fix error in diff_filepair::status documentation, and point to the in-code reference as well as the doc. Signed-off-by: Yann Dirson <> Signed-off-by: Junio C Hamano <>
Mikael Magnusson
Document that git-log takes --all-match. Signed-off-by: Mikael Magnusson <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Update draft release notes Signed-off-by: Junio C Hamano <>
Junio C Hamano
Merge branch 'js/maint-fetch-update-head' into maint * js/maint-fetch-update-head: pull: allow "git pull origin $something:$current_branch" into an unborn branch Fix fetch/pull when run without --update-head-ok
Junio C Hamano
Merge branch 'jk/maint-ls-files-other' into maint * jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status
Junio C Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new' into maint * jc/maint-reset-remove-unmerged-new: reset --hard/read-tree --reset -u: remove unmerged new paths
Junio C Hamano
Merge branch 'jc/maint-co-track' into maint * jc/maint-co-track: Enhance hold_lock_file_for_{update,append}() API demonstrate breakage of detached checkout with symbolic link HEAD Fix "checkout --track -b newbranch" on detached HEAD
Junio C Hamano
Start cycle Signed-off-by: Junio C Hamano <>
Tom Preston-Werner
add instructions on how to send patches to the mailing list with Gmail Gmail is one of the most popular email providers in the world. Now that Gmail supports IMAP, sending properly formatted patches via `git imap-send` is trivial. This section in SubmittingPatches explains how to do so. Signed-off-by: Tom Preston-Werner <> Signed-off-by: Junio C Hamano <>
Jakub Narębski
Documentation/gitattributes: Add subsection header for each attribute This makes attributes easier to find; before this patch some attributes had individual subsections, and some didn't. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
Pierre Habouzit
git send-email: avoid leaking directory file descriptors. Signed-off-by: Pierre Habouzit <> Signed-off-by: Junio C Hamano <>
Jeff King
send-pack: do not send out single-level refs such as refs/stash Since no version of receive-pack accepts these "funny refs", we should mirror the check when considering the list of refs to send. IOW, don't even make them eligible for matching or mirroring. Signed-off-by: Junio C Hamano <>
Jeff King
fix overlapping memcpy in normalize_absolute_path The comments for normalize_absolute_path explicitly claim that the source and destination buffers may be the same (though they may not otherwise overlap). Thus the call to memcpy may involve copying overlapping data, and memmove should be used instead. This fixes a valgrind error in t1504. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Jeff King
pack-objects: avoid reading uninitalized data In the main loop of find_deltas, we do: struct object_entry *entry = *list++; ... if (!*list_size) ... break Because we look at and increment *list _before_ the check of list_size, in the very last iteration of the loop we will look at uninitialized data, and increment the pointer beyond one past the end of the allocated space. Since we don't actually do anything with the data until …
Jeff King
correct cache_entry allocation Most cache_entry structs are allocated by using the cache_entry_size macro, which rounds the size of the struct up to the nearest multiple of 8 bytes (presumably to avoid memory fragmentation). There is one exception: the special "conflict entry" is allocated with an empty name, and so is explicitly given just one extra byte to hold the NUL. However, later code doesn't realize that this particul…
Junio C Hamano
Merge branch 'maint' of git:// into maint * 'maint' of git:// git-gui: Help identify aspell version on Windows too
Miklos Vajna
update-ref --no-deref -d: handle the case when the pointed ref is packed In this case we did nothing in the past, but we should delete the reference in fact. The problem was that when the symref is not packed but the referenced ref is packed, then we assumed that the symref is packed as well, but symrefs are never packed. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>
Deskin Miller
git-svn: change dashed git-commit-tree to git commit-tree Signed-off-by: Deskin Miller <> Signed-off-by: Junio C Hamano <>
Jan Krüger
Documentation: clarify information about 'ident' attribute The documentation spoke of the attribute being set "to" a path; this can mistakenly be interpreted as "the attribute needs to have its value set to some kind of path". This clarifies things. Signed-off-by: Jan Krüger <> Signed-off-by: Junio C Hamano <>
Markus Heidelberg
bash completion: add doubledash to "git show" Signed-off-by: Markus Heidelberg <> Signed-off-by: Junio C Hamano <>
Alex Riesen
Use test-chmtime -v instead of perl in t5000 to get mtime of a file The test was broken on admittedly broken combination of Windows, Cygwin, and ActiveState Perl. Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
  1. Prev
  2. Next