Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
sort by:
Revision Author Date Message Commit Date
7747164 Jeff King 12 December 2011, 07:51:36 UTC mv: make non-directory destination error more clear If you try to "git mv" multiple files onto another non-directory file, you confusingly get the "usage" message: $ touch one two three $ git add . $ git mv one two three usage: git mv [options] <source>... <destination> [...] From the user's perspective, that makes no sense. They just gave parameters that exactly match that usage! This behavior dates back to the original C version of "git mv", which had a usage message like: usage: git mv (<source> <destination> | <source>... <destination>) This was slightly less confusing, because it at least mentions that there are two ways to invoke (but it still isn't clear why what the user provided doesn't work). Instead, let's show an error message like: $ git mv one two three fatal: destination 'three' is not a directory We could leave the usage message in place, too, but it doesn't actually help here. It contains no hints that there are two forms, nor that multi-file form requires that the endpoint be a directory. So it just becomes useless noise that distracts from the real error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 December 2011, 19:55:46 UTC
07b8738 Jeff King 12 December 2011, 07:51:24 UTC mv: honor --verbose flag The code for a verbose flag has been here since "git mv" was converted to C many years ago, but actually getting the "-v" flag from the command line was accidentally lost in the transition. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 December 2011, 19:52:31 UTC
cfe21f0 Jeff King 12 December 2011, 07:50:31 UTC docs: mention "-k" for both forms of "git mv" The "git mv" synopsis shows two forms: renaming a file, and moving files into a directory. They can both make use of the "-k" flag to ignore errors, so mention it in both places. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 December 2011, 19:49:49 UTC
a9bfbc5 Jeff King 12 December 2011, 14:25:51 UTC compat/snprintf: don't look at va_list twice If you define SNPRINTF_RETURNS_BOGUS, we use a special git_vsnprintf wrapper assumes that vsnprintf returns "-1" instead of the number of characters that you would need to store the result. To do this, it invokes vsnprintf multiple times, growing a heap buffer until we have enough space to hold the result. However, this means we evaluate the va_list parameter multiple times, which is generally a bad thing (it may be modified by calls to vsnprintf, yielding undefined behavior). Instead, we must va_copy it and hand the copy to vsnprintf, so we always have a pristine va_list. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 December 2011, 17:09:35 UTC
3d0b051 Pete Harlan 07 December 2011, 07:01:28 UTC Test 'checkout -m -- path' Signed-off-by: Pete Harlan <pgit@pcharlan.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 December 2011, 05:26:57 UTC
5914f2d Jeff King 08 December 2011, 08:43:19 UTC fetch: create status table using strbuf When we fetch from a remote, we print a status table like: From url * [new branch] foo -> origin/foo We create this table in a static buffer using sprintf. If the remote refnames are long, they can overflow this buffer and smash the stack. Instead, let's use a strbuf to build the string. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 December 2011, 07:17:00 UTC
10dd3b2 Junio C Hamano 09 December 2011, 21:33:39 UTC Merge branch 'maint-1.7.7' into maint * maint-1.7.7: am: don't persist keepcr flag mingw: give waitpid the correct signature git symbolic-ref: documentation fix 09 December 2011, 21:33:39 UTC
7919704 Martin von Zweigbergk 09 December 2011, 07:30:45 UTC am: don't persist keepcr flag The keepcr flag is only used in the split_patches function, which is only called before a patch application has to stopped for user input, not after resuming. It is therefore unnecessary to persist the flag. This seems to have been the case since it was introduced in ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit, 2010-02-27). Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 December 2011, 18:49:43 UTC
956d86d Erik Faye-Lund 08 December 2011, 19:39:57 UTC mingw: give waitpid the correct signature POSIX says that last parameter to waitpid should be 'int', so let's make it so. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 December 2011, 18:46:52 UTC
6a5ceda Jens Lehmann 07 December 2011, 21:50:14 UTC diff/status: print submodule path when looking for changes fails diff and status run "git status --porcelain" inside each populated submodule to see if it contains changes (unless told not to do so via config or command line option). When that fails, e.g. due to a corrupt submodule .git directory, it just prints "git status --porcelain failed" or "Could not run git status --porcelain" without giving the user a clue where that happened. Add '"in submodule %s", path' to these error strings to tell the user where exactly the problem occurred. Reported-by: Seth Robertson <in-gitvger@baka.org> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 December 2011, 19:15:01 UTC
a8d05d7 Michael Haggerty 07 December 2011, 15:20:16 UTC git symbolic-ref: documentation fix The old "git symbolic-ref" manpage seemed to imply in one place that symlinks are still the default way to represent symbolic references and in another that symlinks are deprecated. Fix the text and shorten the justification for the change of implementation. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 December 2011, 19:10:12 UTC
fbbccd0 Junio C Hamano 05 December 2011, 18:58:23 UTC checkout -m: no need to insist on having all 3 stages The content level merge machinery ll_merge() is prepared to merge correctly in "both sides added differently" case by using an empty blob as if it were the common ancestor. "checkout -m" could do the same, but didn't bother supporting it and instead insisted on having all three stages. Reported-by: Pete Harlan Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 December 2011, 22:17:01 UTC
37e7793 Thomas Rast 06 December 2011, 16:35:08 UTC userdiff: allow * between cpp funcname words The cpp pattern, used for C and C++, would not match the start of a declaration such as static char *prepare_index(int argc, because it did not allow for * anywhere between the various words that constitute the modifiers, type and function name. Fix it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 December 2011, 21:16:37 UTC
e47a858 Eric Wong 06 December 2011, 04:39:36 UTC enable SO_KEEPALIVE for connected TCP sockets Sockets may never receive notification of some link errors, causing "git fetch" or similar processes to hang forever. Enabling keepalive messages allows hung processes to error out after a few minutes/hours depending on the keepalive settings of the system. This is a problem noticed when running non-interactive cronjobs to mirror repositories using "git fetch". Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 December 2011, 05:06:53 UTC
b1af963 Junio C Hamano 05 December 2011, 23:07:54 UTC Merge branch 'maint-1.7.7' into maint * maint-1.7.7: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore 05 December 2011, 23:07:54 UTC
c34ba99 Junio C Hamano 05 December 2011, 23:07:49 UTC Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore 05 December 2011, 23:07:49 UTC
c2857fb Jeff King 05 December 2011, 22:29:15 UTC stripspace: fix outdated comment The comment on top of stripspace() claims that the buffer will no longer be NUL-terminated. However, this has not been the case at least since the move to using strbuf in 2007. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 December 2011, 23:04:38 UTC
332de7a Sebastian Morr 02 December 2011, 22:55:28 UTC Add MYMETA.yml to perl/.gitignore This file is auto-generated by newer versions of ExtUtils::MakeMaker (presumably starting with the version shipping with Perl 5.14). It just contains extra information about the environment and arguments to the Makefile-building process, and should be ignored. Signed-off-by: Sebastian Morr <sebastian@morr.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 December 2011, 22:42:40 UTC
cc64b31 Brandon Casey 03 December 2011, 20:35:50 UTC builtin/apply.c: report error on failure to recognize input When git apply is passed something that is not a patch, it does not produce an error message or exit with a non-zero status if it was not actually "applying" the patch i.e. --check or --numstat etc were supplied on the command line. Fix this by producing an error when apply fails to find any hunks whatsoever while parsing the patch. This will cause some of the output formats (--numstat, --diffstat, etc) to produce an error when they formerly would have reported zero changes and exited successfully. That seems like the correct behavior though. Failure to recognize the input as a patch should be an error. Plus, add a test. Reported-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 December 2011, 19:20:50 UTC
590a472 Brandon Casey 03 December 2011, 20:35:49 UTC t/t4131-apply-fake-ancestor.sh: fix broken test The third test "apply --build-fake-ancestor in a subdirectory" has been broken since it was introduced. It intended to modify a tracked file named 'sub/3.t' and then produce a diff which could be git apply'ed, but the file named 'sub/3.t' does not exist. The file that exists in the repo is called 'sub/3'. Since no tracked files were modified, an empty diff was produced, and the test succeeded. Correct this test by supplying the intended name of the tracked file, 'sub/3.t', to test_commit in the first test. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 December 2011, 19:18:51 UTC
eb3b8d7 Junio C Hamano 05 December 2011, 19:15:52 UTC Merge branch 'js/merge-edit-option' * js/merge-edit-option: Documentation: fix formatting error in merge-options.txt 05 December 2011, 19:15:52 UTC
aad2a07 Jack Nagel 05 December 2011, 07:53:27 UTC Documentation: fix formatting error in merge-options.txt The first paragraph inside of a list item does not need a preceding line consisting of a single '+', and in fact this causes the text to be misrendered. Fix it. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 December 2011, 19:15:45 UTC
406da78 Junio C Hamano 02 December 2011, 17:31:32 UTC Git 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 December 2011, 18:02:52 UTC
0becb3e Andrew Wong 30 November 2011, 15:52:51 UTC rebase -i: interrupt rebase when "commit --amend" failed during "reword" "commit --amend" could fail in cases like the user empties the commit message, or pre-commit failed. When it fails, rebase should be interrupted and alert the user, rather than ignoring the error and continue on rebasing. This also gives users a way to gracefully interrupt a "reword" if they decided they actually want to do an "edit", or even "rebase --abort". Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 November 2011, 19:30:53 UTC
1838685 Johan Herland 25 November 2011, 00:09:47 UTC fast-import: Fix incorrect fanout level when modifying existing notes refs This fixes the bug uncovered by the tests added in the previous two patches. When an existing notes ref was loaded into the fast-import machinery, the num_notes counter associated with that ref remained == 0, even though the true number of notes in the loaded ref was higher. This caused a fanout level of 0 to be used, although the actual fanout of the tree could be > 0. Manipulating the notes tree at an incorrect fanout level causes removals to silently fail, and modifications of existing notes to instead produce an additional note (leaving the old object in place at a different fanout level). This patch fixes the bug by explicitly counting the number of notes in the notes tree whenever it looks like the num_notes counter could be wrong (when num_notes == 0). There may be false positives (i.e. triggering the counting when the notes tree is truly empty), but in those cases, the counting should not take long. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2011, 00:38:46 UTC
9ff5e21 Johan Herland 25 November 2011, 00:09:46 UTC t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling The previous patch exposed a bug in fast-import where _removing_ an existing note fails (when that note resides on a non-zero fanout level, and was added prior to this fast-import run). This patch demostrates the same issue when _changing_ an existing note (subject to the same circumstances). Discovered-by: Henrik Grubbström <grubba@roxen.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2011, 00:37:17 UTC
d107541 Johan Herland 25 November 2011, 00:09:45 UTC t9301: Fix testcase covering up a bug in fast-import's notes fanout handling There is a bug in fast-import where the fanout levels of an existing notes tree being loaded into the fast-import machinery is disregarded. Instead, any tree loaded is assumed to have a fanout level of 0. If the true fanout level is deeper, any attempt to remove a note from that tree will silently fail (as the note will not be found at fanout level 0). However, this bug was covered up by the way in which the t9301 testcase was written: When generating the fast-import commands to test mass removal of notes, we appended these commands to an already existing 'input' file which happened to already contain the fast-import commands used in the previous subtest to generate the very same notes tree. This would normally be harmless (but suboptimal) as the notes created were identical to the notes already present in the notes tree. But the act of repeating all the notes additions caused the internal fast-import data structures to recalculate the fanout, instead of hanging on to the initial (incorrect) fanout (that causes the bug described above). Thus, the subsequent removal of notes in the same 'input' file would succeed, thereby covering up the bug described above. This patch creates a new 'input' file instead of appending to the file from the previous subtest. Thus, we end up properly testing removal of notes that were added by a previous fast-import command. As a side effect, the notes removal can no longer refer to commits using the marks set by the previous fast-import run, instead the commits names must be referenced directly. The underlying fast-import bug is still present after this patch, but now we have at least uncovered it. Therefore, the affected subtests are labeled as expected failures until the underlying bug is fixed. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 November 2011, 00:36:44 UTC
fc14b89 Junio C Hamano 28 November 2011, 22:07:13 UTC Git 1.7.8-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 November 2011, 22:07:22 UTC
39bd6f7 Jonathan Nieder 26 November 2011, 08:54:55 UTC Allow checkout -B <current-branch> to update the current branch When on master, "git checkout -B master <commit>" is a more natural way to say "git reset --keep <commit>", which was originally invented for the exact purpose of moving to the named commit while keeping the local changes around. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 November 2011, 19:40:46 UTC
3f59481 Jonathan Nieder 26 November 2011, 02:30:02 UTC branch: allow a no-op "branch -M <current-branch> HEAD" Overwriting the current branch with a different commit is forbidden, as it will make the status recorded in the index and the working tree out of sync with respect to the HEAD. There however is no reason to forbid it if the current branch is renamed to itself, which admittedly is something only an insane user would do, but is handy for scripts. Test script is by Conrad Irwin. Reported-by: Soeren Sonnenburg <sonne@debian.org> Reported-by: Josh Chia (谢任中) Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 November 2011, 19:40:46 UTC
284e3d2 Carlos Martín Nieto 28 November 2011, 10:48:12 UTC convert: track state in LF-to-CRLF filter There may not be enough space to store CRLF in the output. If we don't fill the buffer, then the filter will keep getting called with the same short buffer and will loop forever. Instead, always store the CR and record whether there's a missing LF if so we store it in the output buffer the next time the function gets called. Reported-by: Henrik Grubbström <grubba@roxen.com> Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 November 2011, 19:30:34 UTC
fc001b5 Nguyễn Thái Ngọc Duy 27 November 2011, 10:15:32 UTC checkout,merge: loosen overwriting untracked file check based on info/exclude Back in 1127148 (Loosen "working file will be lost" check in Porcelain-ish - 2006-12-04), git-checkout.sh learned to quietly overwrite ignored files. Howver the code only took .gitignore files into account. Standard ignored files include all specified in .gitignore files in working directory _and_ $GIT_DIR/info/exclude. This patch makes sure ignored files in info/exclude can also be overwritten automatically in the spirit of the original patch. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 November 2011, 18:37:50 UTC
3686aa1 Junio C Hamano 23 November 2011, 21:28:53 UTC Merge branch 'maint' into tj/imap-send-remove-unused * maint: (18123 commits) documentation fix: git difftool uses diff tools, not merge tools. Git 1.7.7.4 Makefile: add missing header file dependencies notes merge: eliminate OUTPUT macro mailmap: xcalloc mailmap_info name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.3 docs: Update install-doc-quick docs: don't mention --quiet or --exit-code in git-log(1) Git 1.7.7.2 t7511: avoid use of reserved filename on Windows. clone: Quote user supplied path in a single quote pair read-cache.c: fix index memory allocation make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Git 1.7.7.1 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting gitweb: fix regression when filtering out forks Almost ready for 1.7.7.1 pack-objects: don't traverse objects unnecessarily ... Conflicts: imap-send.c 23 November 2011, 21:28:53 UTC
aa2577a Thomas Jarosch 23 November 2011, 20:32:37 UTC imap-send: Remove unused 'use_namespace' variable Reported by cppcheck Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 21:28:06 UTC
d69bafc Vincent van Ravesteijn 23 November 2011, 06:44:16 UTC builtin-reset: Documentation update The second mode of 'git reset' is defined by the --patch option, while the third mode is defined by the <mode> option. Hence, these options are mandatory in the description of the individual modes. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 21:24:54 UTC
5cd75c7 Vincent van Ravesteijn 23 November 2011, 06:31:55 UTC builtin-branch: Fix crash on invalid use of --force The option --force should not put us in 'create branch' mode. The fact that this option is only valid in 'create branch' mode is already caught by the the next 'if' in which we assure that we are in the correct mode. Without this patch, "git branch -f" without any other argument ends up calling create_branch without any branch name. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 21:23:33 UTC
b15aa97 Jonathan Nieder 23 November 2011, 10:04:52 UTC revert --abort: do not leave behind useless sequencer-old directory The "git cherry-pick --abort" command currently renames the .git/sequencer directory to .git/sequencer-old instead of removing it on success due to an accident. cherry-pick --abort is designed to work in three steps: 1) find which commit to roll back to 2) call "git reset --merge <commit>" to move to that commit 3) remove the .git/sequencer directory But the careless author forgot step 3 entirely. The only reason the command worked anyway is that "git reset --merge <commit>" renames the .git/sequencer directory as a secondary effect --- after moving to <commit>, or so the logic goes, it is unlikely but possible that the caller of git reset wants to continue the series of cherry-picks that was in progress, so git renames the sequencer state to .git/sequencer-old to be helpful while allowing the cherry-pick to be resumed if the caller did not want to end the sequence after all. By running "git cherry-pick --abort", the operator has clearly indicated that she is not planning to continue cherry-picking. Remove the (renamed) .git/sequencer directory as intended all along. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 18:56:29 UTC
2a4037d Johannes Sixt 23 November 2011, 08:49:38 UTC Fix revert --abort on Windows On Windows, it is not possible to rename or remove a directory that has open files. 'revert --abort' renamed .git/sequencer when it still had .git/sequencer/head open. Close the file as early as possible to allow the rename operation on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 18:54:57 UTC
b4524d3 Nguyễn Thái Ngọc Duy 23 November 2011, 12:45:36 UTC revert: do not pass non-literal string as format to git_path() This fixes the following warning. CC builtin/revert.o builtin/revert.c: In function ‘write_cherry_pick_head’: builtin/revert.c:311: warning: format not a string literal and no format arguments Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 17:29:53 UTC
017d1e1 Junio C Hamano 23 November 2011, 02:23:36 UTC Update 1.7.8 draft release notes in preparation for rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 02:23:36 UTC
9fd389b Junio C Hamano 23 November 2011, 02:22:08 UTC Merge branch 'jn/revert-quit' * jn/revert-quit: revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit 23 November 2011, 02:22:08 UTC
c427b21 Jonathan Nieder 22 November 2011, 11:20:46 UTC revert: remove --reset compatibility option Remove the "git cherry-pick --reset" option, which has a different preferred spelling nowadays ("--quit"). Luckily the old --reset name was not around long enough for anyone to get used to it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 02:18:02 UTC
539047c Jonathan Nieder 23 November 2011, 01:27:21 UTC revert: introduce --abort to cancel a failed cherry-pick After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 November 2011, 02:16:59 UTC
82433cd Jonathan Nieder 22 November 2011, 11:17:36 UTC revert: write REVERT_HEAD pseudoref during conflicted revert When conflicts are encountered while reverting a commit, it can be handy to have the name of that commit easily available. For example, to produce a copy of the patch to refer to while resolving conflicts: $ git revert 2eceb2a8 error: could not revert 2eceb2a8... awesome, buggy feature $ git show -R REVERT_HEAD >the-patch $ edit $(git diff --name-only) Set a REVERT_HEAD pseudoref when "git revert" does not make a commit, for cases like this. This also makes it possible for scripts to distinguish between a revert that encountered conflicts and other sources of an unmerged index. After successfully committing, resetting with "git reset", or moving to another commit with "git checkout" or "git reset", the pseudoref is no longer useful, so remove it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2011, 21:34:44 UTC
b8c7469 Jonathan Nieder 22 November 2011, 11:15:47 UTC revert: improve error message for cherry-pick during cherry-pick In the spirit of v1.6.3.3~3^2 (refuse to merge during a merge, 2009-07-01), "git cherry-pick" refuses to start a new cherry-pick when in the middle of an existing conflicted cherry-pick in the following sequence: 1. git cherry-pick HEAD..origin 2. resolve conflicts 3. git cherry-pick HEAD..origin (instead of "git cherry-pick --continue", by mistake) Good. However, the error message on attempting step 3 is more convoluted than necessary: $ git cherry-pick HEAD..origin error: .git/sequencer already exists. error: A cherry-pick or revert is in progress. hint: Use --continue to continue the operation hint: or --quit to forget about it fatal: cherry-pick failed Clarify by removing the redundant first "error:" message, simplifying the advice, and using lower-case and no full stops to be consistent with other commands that prefix their messages with "error:", so it becomes error: a cherry-pick or revert is already in progress hint: try "git cherry-pick (--continue | --quit)" fatal: cherry-pick failed The "fatal: cherry-pick failed" line seems unnecessary, too, but that can be fixed some other day. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2011, 21:33:49 UTC
dffc860 Jonathan Nieder 22 November 2011, 11:15:10 UTC revert: rearrange pick_revisions() for clarity Deal completely with "cherry-pick --quit" and --continue at the beginning of pick_revisions(), leaving the rest of the function for the more interesting "git cherry-pick <commits>" case. No functional change intended. The impact is just to unindent the code a little. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2011, 21:33:01 UTC
f80a872 Jonathan Nieder 22 November 2011, 11:14:29 UTC revert: rename --reset option to --quit The option to "git cherry-pick" and "git revert" to discard the sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce --reset to remove sequencer state, 2011-08-04) has a confusing name. Change it now, while we still have the time. The new name for "cherry-pick, please get out of my way, since I've long forgotten about the sequence of commits I was cherry-picking when you wrote that old .git/sequencer directory" is --quit. Mnemonic: this is analagous to quiting a program the user is no longer using --- we just want to get out of the multiple-command cherry-pick procedure and not to reset HEAD or rewind any other old state. The "--reset" option is kept as a synonym to minimize the impact. We might consider dropping it for simplicity in a separate patch, though. Adjust documentation and tests to use the newly preferred name (--quit) instead of --reset. While at it, let's clarify the short descriptions of these operations in "-h" output. Before: --reset forget the current operation --continue continue the current operation After: --quit end revert or cherry-pick sequence --continue resume revert or cherry-pick sequence Noticed-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 November 2011, 21:30:35 UTC
7b51c33 Junio C Hamano 21 November 2011, 23:04:11 UTC Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive * jk/maint-1.6.2-upload-archive: archive: don't let remote clients get unreachable commits Conflicts: archive.c archive.h builtin-archive.c builtin/upload-archive.c t/t5000-tar-tree.sh 21 November 2011, 23:04:11 UTC
ee27ca4 Jeff King 17 November 2011, 23:04:22 UTC archive: don't let remote clients get unreachable commits Usually git is careful not to allow clients to fetch arbitrary objects from the database; for example, objects received via upload-pack must be reachable from a ref. Upload-archive breaks this by feeding the client's tree-ish directly to get_sha1, which will accept arbitrary hex sha1s, reflogs, etc. This is not a problem if all of your objects are publicly reachable anyway (or at least public to anybody who can run upload-archive). Or if you are making the repo available by dumb protocols like http or rsync (in which case the client can read your whole object db directly). But for sites which allow access only through smart protocols, clients may be able to fetch trees from commits that exist in the server's object database but are not referenced (e.g., because history was rewound). This patch tightens upload-archive's lookup to use dwim_ref rather than get_sha1. This means a remote client can only fetch the tip of a named ref, not an arbitrary sha1 or reflog entry. This also restricts some legitimate requests, too: 1. Reachable non-tip commits, like: git archive --remote=$url v1.0~5 2. Sub-trees of reachable commits, like: git archive --remote=$url v1.7.7:Documentation Local requests continue to use get_sha1, and are not restricted at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2011, 22:42:25 UTC
e14d631 Junio C Hamano 21 November 2011, 22:30:45 UTC Merge branch 'maint' * maint: documentation fix: git difftool uses diff tools, not merge tools. 21 November 2011, 22:30:45 UTC
0f64a5a Junio C Hamano 21 November 2011, 19:03:20 UTC Merge branch 'rr/misc-fixes' * rr/misc-fixes: convert.c: Fix return type of git_path_check_eol() 21 November 2011, 19:03:20 UTC
ef563de Ramsay Jones 21 November 2011, 18:42:09 UTC convert.c: Fix return type of git_path_check_eol() The git_path_check_eol() function converts a string value to the corresponding 'enum eol' value. However, the function is currently declared to return an 'enum crlf_action', which causes sparse to complain thus: SP convert.c convert.c:736:50: warning: mixing different enum types convert.c:736:50: int enum crlf_action versus convert.c:736:50: int enum eol In order to suppress the warning, we simply correct the return type in the function declaration. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2011, 19:00:57 UTC
1e501a7 Thomas Hochstein 14 November 2011, 22:55:52 UTC documentation fix: git difftool uses diff tools, not merge tools. Let the documentation for -t list valid *diff* tools, not valid *merge* tools. Signed-off-by: Thomas Hochstein <thh@inter.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2011, 17:14:34 UTC
05bab3e Ramsay Jones 19 November 2011, 19:42:00 UTC config.c: Fix a static buffer overwrite bug by avoiding mkpath() On cygwin, test number 21 of t3200-branch.sh (git branch -m q q2 without config should succeed) fails. The failure involves the functions from path.c which parcel out internal static buffers from the git_path() and mkpath() functions. In particular, the rename_ref() function calls safe_create_leading\ _directories() with a filename returned by git_path("logs/%s", ref). safe_create_leading_directories(), in turn, calls stat() on each element of the path it is given. On cygwin, this leads to a call to git_config() for each component of the path, since this test explicitly removes the config file. git_config() calls mkpath(), so on the fourth component of the path, the original buffer passed into the function is overwritten with the config filename. Note that this bug is specific to cygwin and it's schizophrenic stat() functions (see commits adbc0b6, 7faee6b and 7974843). The lack of a config file and a path with at least four elements is also important to trigger the bug. In order to fix the problem, we replace the call to mkpath() with a call to mksnpath() and provide our own buffer. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2011, 03:32:09 UTC
3a81f33 Ramsay Jones 19 November 2011, 19:38:54 UTC t5501-*.sh: Fix url passed to clone in setup test In particular, the url passed to git-clone has an extra '/' given after the 'file://' schema prefix, thus: git clone --reference=original "file:///$(pwd)/original one Once the prefix is removed, the remainder of the url looks something like "//home/ramsay/git/t/...", which is then interpreted as an network path. This then results in a "Permission denied" error, like so: ramsay $ ls //home ls: cannot access //home: No such host or network path ramsay $ ls //home/ramsay ls: cannot access //home/ramsay: Permission denied ramsay $ In order to fix the problem, we simply remove the extraneous '/' character from the url. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 November 2011, 03:24:24 UTC
f56ef11 Junio C Hamano 18 November 2011, 22:19:45 UTC Hopefully final update of release notes before 1.7.8 final Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 22:19:45 UTC
9e9ab40 Junio C Hamano 18 November 2011, 22:13:48 UTC Merge branch 'rr/misc-fixes' * rr/misc-fixes: git-compat-util: don't assume value for undefined variable sha1_file: don't mix enum with int convert: don't mix enum with int http: remove unused function hex() 18 November 2011, 22:13:48 UTC
73b7eae Jeff King 18 November 2011, 11:13:08 UTC refresh_index: make porcelain output more specific If you have a deleted file and a porcelain refreshes the cache, we print: Unstaged changes after reset: M file This is technically correct, in that the file is modified, but it's friendlier to the user if we further differentiate the case of a deleted file (especially because this output looks a lot like "diff --name-status", which would also make the distinction). Similarly, we can distinguish typechanges ("T") and intent-to-add files ("A"), both of which appear as just "M" in the current output. The plumbing output for all cases remains "needs update" for historical compatibility. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 19:55:58 UTC
4bd4e73 Jeff King 18 November 2011, 11:11:28 UTC refresh_index: rename format variables When refreshing the index, for modified (or unmerged) files we will print "needs update" (or "needs merge") for plumbing, or line similar to the output from "diff --name-status" for porcelain. The variables holding which type of message to show are named after the plumbing messages. However, as we begin to differentiate more cases at the porcelain level (with the plumbing message staying the same), that naming scheme will become awkward. Instead, name the variables after which case we found (modified or unmerged), not what we will output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 19:55:05 UTC
d05e697 Jeff King 18 November 2011, 11:11:08 UTC read-cache: let refresh_cache_ent pass up changed flags This will enable refresh_cache to differentiate more cases of modification (such as typechange) when telling the user what isn't fresh. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 19:53:46 UTC
024c843 Jonathan Nieder 18 November 2011, 09:58:21 UTC Makefile: add option to disable automatic dependency generation Now that the COMPUTE_HEADER_DEPENDENCIES feature is turned on automatically for compilers that support it (see v1.7.8-rc0~142^2~1, 2011-08-18), there is no easy way to force it off. For example, setting COMPUTE_HEADER_DEPENDENCIES to the empty string in config.mak just tells the makefile to treat it as undefined and run a test command to see if the -MMD option is supported. So allow setting COMPUTE_HEADER_DEPENDENCIES=no to explicitly force the feature off. The new semantics: - "yes" means to explicitly enable the feature - "no" means to disable it - "auto" means to autodetect The default is still "auto". Any value other than these three will cause the build to error out with a descriptive message so typos and stale settings in config.mak don't result in mysterious behavior. Makefile:1278: *** please set COMPUTE_HEADER_DEPENDENCIES to yes, no, or auto (not "1"). Stop. So now when someone using a compiler without -MMD support reports trouble building git, you can reproduce it by running "make COMPUTE_HEADER_DEPENDENCIES=no". Suggested-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Tested-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 19:35:08 UTC
4c00c85 Junio C Hamano 18 November 2011, 19:30:02 UTC Sync with 1.7.7.4 18 November 2011, 19:30:02 UTC
bd5bce7 Junio C Hamano 18 November 2011, 19:28:05 UTC Git 1.7.7.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 19:28:05 UTC
c9de921 Junio C Hamano 18 November 2011, 19:14:16 UTC Merge branch 'jc/maint-name-rev-all' into maint * jc/maint-name-rev-all: name-rev --all: do not even attempt to describe non-commit object 18 November 2011, 19:14:16 UTC
79cfe0c Junio C Hamano 18 November 2011, 19:14:00 UTC Merge branch 'ml/mailmap' into maint * ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c 18 November 2011, 19:14:00 UTC
01e0f16 Junio C Hamano 18 November 2011, 19:11:50 UTC Merge branch 'jn/maint-notes-avoid-va-args' into maint * jn/maint-notes-avoid-va-args: notes merge: eliminate OUTPUT macro Conflicts: notes-merge.c 18 November 2011, 19:11:50 UTC
487da9c Jonathan Nieder 18 November 2011, 10:02:02 UTC Makefile: add missing header file dependencies When the streaming filter API was introduced in v1.7.7-rc0~60^2~7 (2011-05-20), we forgot to add its header to LIB_H. Most translation units depend on streaming.h via cache.h. v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared dependencies by url.o on url.h and thread-utils.o on thread-utils.h. Noticed by make CHECK_HEADER_DEPENDENCIES=1. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 18:45:33 UTC
5f9f8d1 Jonathan Nieder 18 November 2011, 01:27:46 UTC notes merge: eliminate OUTPUT macro The macro is variadic, which breaks support for pre-C99 compilers, and it hides an "if", which can make code hard to understand on first reading if some arguments have side-effects. The OUTPUT macro seems to have been inspired by the "output" function from merge-recursive. But that function in merge-recursive exists to indent output based on the level of recursion and there is no similar justification for such a function in "notes merge". Noticed with 'make CC="gcc -std=c89 -pedantic"': notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros] Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2011, 07:35:22 UTC
418c9b1 Jonathan Nieder 16 November 2011, 08:03:36 UTC do not let git_path clobber errno when reporting errors Because git_path() calls vsnprintf(), code like fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666); die_errno(_("Could not write to '%s'"), git_path("SQUASH_MSG")); can end up printing an error indicator from vsnprintf() instead of open() by mistake. Store the path we are trying to write to in a temporary variable and pass _that_ to die_errno(), so the messages written by git cherry-pick/revert and git merge can avoid this source of confusion. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2011, 23:06:27 UTC
4d2440f Junio C Hamano 17 November 2011, 19:06:15 UTC Git 1.7.8-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2011, 19:06:15 UTC
f63c79d Junio C Hamano 17 November 2011, 06:04:03 UTC pack-object: tolerate broken packs that have duplicated objects When --reuse-delta is in effect (which is the default), and an existing pack in the repository has the same object registered twice (e.g. one copy in a non-delta format and the other copy in a delta against some other object), an attempt to repack the repository can result in a cyclic delta dependency, causing write_one() function to infinitely recurse into itself. Detect such a case and break the loopy dependency by writing out an object that is involved in such a loop in the non-delta format. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2011, 06:06:08 UTC
68be2fe Junio C Hamano 17 November 2011, 06:04:13 UTC receive-pack, fetch-pack: reject bogus pack that records objects twice When receive-pack & fetch-pack are run and store the pack obtained over the wire to a local repository, they internally run the index-pack command with the --strict option. Make sure that we reject incoming packfile that records objects twice to avoid spreading such a damage. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2011, 06:05:21 UTC
09116a1 Junio C Hamano 17 November 2011, 00:54:32 UTC refs: loosen over-strict "format" check The add_extra_ref() interface is used to add an extra-ref that is _not_ our ref for the purpose of helping auto-following of tags and reducing object transfer from remote repository, and they are typically formatted as a tagname followed by ^{} to make sure no valid refs match that pattern. In other words, these entries are deliberately formatted not to pass check-refname-format test. A recent series however added a test unconditionally to the add_ref() function that is called from add_extra_ref(). The check may be sensible for other two callsites of the add_ref() interface, but definitely is a wrong thing to do in add_extra_ref(). Disable it. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Michael Haggerty <mhagger@alum.mit.edu> 17 November 2011, 05:52:24 UTC
74b531f Marc-André Lureau 17 November 2011, 01:25:06 UTC mailmap: xcalloc mailmap_info This is to avoid reaching free of uninitialized members. With an invalid .mailmap (and perhaps in other cases), it can reach free(mi->name) with garbage for example. Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2011, 02:00:56 UTC
5e1e6b9 Ramkumar Ramachandra 15 November 2011, 09:31:32 UTC revert: prettify fatal messages Some of the fatal messages printed by revert and cherry-pick look ugly like the following: fatal: Could not open .git/sequencer/todo.: No such file or directory The culprit here is that these callers of the die_errno() function did not take it into account that the message string they give to it is followed by ": <strerror>", hence the message typically should not end with the full-stop. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2011, 00:59:46 UTC
e4ac953 Ramkumar Ramachandra 15 November 2011, 17:31:09 UTC git-compat-util: don't assume value for undefined variable Suggested-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2011, 00:09:34 UTC
5e12e78 Ramkumar Ramachandra 15 November 2011, 16:59:39 UTC sha1_file: don't mix enum with int Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2011, 00:09:20 UTC
7356b51 Ramkumar Ramachandra 15 November 2011, 16:59:37 UTC convert: don't mix enum with int Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2011, 00:09:02 UTC
620771c Ramkumar Ramachandra 15 November 2011, 16:59:36 UTC http: remove unused function hex() Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2011, 00:08:48 UTC
e8b14d7 Junio C Hamano 15 November 2011, 23:51:05 UTC name-rev --all: do not even attempt to describe non-commit object This even dates back to the very beginning of "git name-rev"; it does not make much sense to dump all objects in the repository and label non-commits as "undefined". Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 November 2011, 23:51:05 UTC
f0c7fd4 Junio C Hamano 15 November 2011, 23:39:33 UTC Revert "upload-archive: use start_command instead of fork" This reverts commit c09cd77ea2fe3580b33918a99fe138d239ac2aaf, expecting a better version to be rerolled soon. 15 November 2011, 23:39:33 UTC
bc1bbe0 Junio C Hamano 13 November 2011, 06:14:53 UTC Git 1.7.8-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2011, 06:14:53 UTC
dc865af Junio C Hamano 12 November 2011, 05:34:06 UTC Merge branch 'ly/mktree-using-strbuf' * ly/mktree-using-strbuf: mktree: fix a memory leak in write_tree() 12 November 2011, 05:34:06 UTC
c444c16 Junio C Hamano 10 November 2011, 17:10:51 UTC Merge "Move 'builtin-*' into a 'builtin/' subdirectory" 10 November 2011, 17:10:51 UTC
77f143b Junio C Hamano 10 November 2011, 17:05:31 UTC Merge 'build-in git-mktree' * commit '633e3556ccbc': (5835 commits) build-in git-mktree allow -t abbreviation for --track in git branch gitweb: Remove function prototypes (cleanup) Documentation: cloning to empty directory is allowed Clarify kind of conflict in merge-one-file helper git config: clarify --add and --get-color archive-tar.c: squelch a type mismatch warning Start 1.6.4 development Start 1.6.3.1 maintenance series. GIT 1.6.3 t4029: use sh instead of bash t4200: convert sed expression which operates on non-text file to perl t4200: remove two unnecessary lines t/annotate-tests.sh: avoid passing a non-newline terminated file to sed t4118: avoid sed invocation on file without terminating newline t4118: add missing '&&' t8005: use egrep when extended regular expressions are required git-clean doc: the command only affects paths under $(cwd) improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test ... 10 November 2011, 17:05:31 UTC
cd9519b Liu Yuan 10 November 2011, 08:39:22 UTC mktree: fix a memory leak in write_tree() We forget to call strbuf_release to release the buf memory. Signed-off-by: Liu Yuan <tailai.ly@taobao.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 November 2011, 17:04:08 UTC
248dbbe Junio C Hamano 09 November 2011, 13:46:39 UTC Merge branch 'sn/complete-bash-wo-process-subst' * sn/complete-bash-wo-process-subst: completion: don't leak variable from the prompt into environment 09 November 2011, 13:46:39 UTC
4804d43 SZEDER Gábor 09 November 2011, 10:02:50 UTC completion: don't leak variable from the prompt into environment Commit e5b8eebc (completion: fix issue with process substitution not working on Git for Windows, 2011-10-26) introduced a new variable in __git_ps1_show_upstream(), but didn't declare it as local to prevent it from leaking into the environment. We may want to rewrite it like the following, but that can wait until the next cycle. while read key value do ... done <<-EOF $(git config -z --get-regexp ...) EOF Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 November 2011, 13:44:05 UTC
8a04247 Junio C Hamano 09 November 2011, 00:42:33 UTC Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 November 2011, 00:42:33 UTC
d7a0129 Junio C Hamano 09 November 2011, 00:40:31 UTC Merge branch 'jc/remote-setbranches-usage-fix' * jc/remote-setbranches-usage-fix: remote: fix set-branches usage 09 November 2011, 00:40:31 UTC
8327ee8 Junio C Hamano 09 November 2011, 00:40:27 UTC Merge branch 'fc/remote-seturl-usage-fix' * fc/remote-seturl-usage-fix: remote: fix remote set-url usage 09 November 2011, 00:40:27 UTC
14ba45a Junio C Hamano 09 November 2011, 00:38:14 UTC Sync with 1.7.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 November 2011, 00:38:14 UTC
d4d5ab4 Junio C Hamano 09 November 2011, 00:37:00 UTC Git 1.7.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 November 2011, 00:37:00 UTC
916034b Junio C Hamano 09 November 2011, 00:35:53 UTC Merge branch 'jc/maint-remove-renamed-ref' into maint * jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c 09 November 2011, 00:35:53 UTC
1a61a9d Junio C Hamano 09 November 2011, 00:26:50 UTC Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks 09 November 2011, 00:26:50 UTC
992499d Junio C Hamano 09 November 2011, 00:26:45 UTC Merge branch 'dm/pack-objects-update' into maint * dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline 09 November 2011, 00:26:45 UTC
fcbebfd Junio C Hamano 08 November 2011, 18:17:40 UTC docs: Update install-doc-quick The preformatted documentation pages live in their own repositories these days. Adjust the installation procedure to the updated layout. Tested-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 November 2011, 21:37:10 UTC
939ca96 Jeff King 08 November 2011, 21:29:30 UTC docs: don't mention --quiet or --exit-code in git-log(1) These are diff-options, but they don't actually make sense in the context of log. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 November 2011, 21:37:02 UTC
4cb6764 Junio C Hamano 08 November 2011, 00:48:34 UTC Git 1.7.8-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 November 2011, 00:48:34 UTC
92622e6 Junio C Hamano 08 November 2011, 00:43:19 UTC Merge branch 'ss/blame-textconv-fake-working-tree' * ss/blame-textconv-fake-working-tree: blame.c: Properly initialize strbuf after calling textconv_object(), again 08 November 2011, 00:43:19 UTC
back to top