| f3f3c4d | Junio C Hamano | 16 February 2012, 22:18:00 UTC | Merge branch 'jk/prompt-fallback-to-tty' into maint * jk/prompt-fallback-to-tty: prompt: fall back to terminal if askpass fails prompt: clean up strbuf usage | 16 February 2012, 22:18:00 UTC |
| 35c60a0 | Junio C Hamano | 16 February 2012, 22:17:58 UTC | Merge branch 'jn/gitweb-search-utf-8' into maint * jn/gitweb-search-utf-8: gitweb: Allow UTF-8 encoded CGI query parameters and path_info | 16 February 2012, 22:17:58 UTC |
| 6c63ab3 | Junio C Hamano | 16 February 2012, 22:08:00 UTC | Merge branch 'jc/maint-commit-ignore-i-t-a' into maint * jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c | 16 February 2012, 22:08:00 UTC |
| c6a4e3f | Junio C Hamano | 16 February 2012, 22:00:25 UTC | Merge branch 'mm/empty-loose-error-message' into maint * mm/empty-loose-error-message: fsck: give accurate error message on empty loose object files | 16 February 2012, 22:00:25 UTC |
| f342afa | Junio C Hamano | 16 February 2012, 22:00:16 UTC | Merge branch 'nk/ctype-for-perf' into maint * nk/ctype-for-perf: ctype: implement islower/isupper macro ctype.c only wants git-compat-util.h | 16 February 2012, 22:00:16 UTC |
| e6d88ca | Junio C Hamano | 16 February 2012, 21:59:53 UTC | Merge branch 'jx/i18n-more-marking' into maint * jx/i18n-more-marking: i18n: format_tracking_info "Your branch is behind" message i18n: git-commit whence_s "merge/cherry-pick" message | 16 February 2012, 21:59:53 UTC |
| 68e4b55 | Zbigniew Jędrzejewski-Szmek | 14 February 2012, 23:54:21 UTC | man: rearrange git synopsis to fit in 80 lines The line was extended in 2dd8c3 ('git: add --info-path and --man-path options'), and the formatted man output stopped fitting into the 80 column window. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2012, 21:01:31 UTC |
| a7fab08 | Ralf Thielow | 15 February 2012, 20:36:58 UTC | completion: --list option for git-branch Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2012, 20:33:50 UTC |
| 5639786 | Junio C Hamano | 16 February 2012, 20:33:46 UTC | Merge branch 'rt/completion-branch-edit-desc' into maint * rt/completion-branch-edit-desc: completion: --edit-description option for git-branch | 16 February 2012, 20:33:46 UTC |
| 90020e3 | Junio C Hamano | 14 February 2012, 17:53:38 UTC | Git 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2012, 17:53:38 UTC |
| a95750c | Junio C Hamano | 14 February 2012, 07:31:27 UTC | Merge branch 'jk/maint-tag-show-fixes' into maint * jk/maint-tag-show-fixes: tag: do not show non-tag contents with "-n" tag: die when listing missing or corrupt objects tag: fix output of "tag -n" when errors occur Conflicts: t/t7004-tag.sh | 14 February 2012, 07:31:27 UTC |
| 801b28a | Junio C Hamano | 14 February 2012, 07:26:31 UTC | Merge branch 'bw/inet-pton-ntop-compat' into maint * bw/inet-pton-ntop-compat: Drop system includes from inet_pton/inet_ntop compatibility wrappers | 14 February 2012, 07:26:31 UTC |
| 1dcfa8d | Junio C Hamano | 14 February 2012, 07:26:25 UTC | Merge branch 'mp/make-cleanse-x-for-exe' into maint * mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage | 14 February 2012, 07:26:25 UTC |
| 42e283a | Junio C Hamano | 14 February 2012, 07:24:02 UTC | Merge branch 'jn/merge-no-edit-fix' into maint * jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag" | 14 February 2012, 07:24:02 UTC |
| 58d4203 | Junio C Hamano | 13 February 2012, 19:46:47 UTC | Update draft release notes to 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2012, 19:46:47 UTC |
| 4daf6fc | Junio C Hamano | 13 February 2012, 19:42:18 UTC | Merge branch 'js/add-e-submodule-fix' into maint * js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty | 13 February 2012, 19:42:18 UTC |
| 87cb3b8 | Junio C Hamano | 13 February 2012, 19:42:15 UTC | Merge branch 'jc/parse-date-raw' into maint * jc/parse-date-raw: parse_date(): '@' prefix forces git-timestamp parse_date(): allow ancient git-timestamp | 13 February 2012, 19:42:15 UTC |
| 5a62b53 | Junio C Hamano | 13 February 2012, 19:42:11 UTC | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint * jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option | 13 February 2012, 19:42:11 UTC |
| 8eb865b | Junio C Hamano | 13 February 2012, 19:42:07 UTC | Merge branch 'jc/branch-desc-typoavoidance' into maint * jc/branch-desc-typoavoidance: branch --edit-description: protect against mistyped branch name tests: add write_script helper function | 13 February 2012, 19:42:07 UTC |
| a78f558 | Junio C Hamano | 13 February 2012, 19:42:04 UTC | Merge branch 'jn/rpm-spec' into maint * jn/rpm-spec: git.spec: Workaround localized messages not put in any RPM | 13 February 2012, 19:42:04 UTC |
| 1f5ad6b | Ævar Arnfjörð Bjarmason | 12 February 2012, 01:05:12 UTC | t: use sane_unset instead of unset Change several tests to use the sane_unset function introduced in v1.7.3.1-35-g00648ba instead of the built-in unset function. This fixes a failure I was having on t9130-git-svn-authors-file.sh on Solaris, and prevents several other issues from occurring. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2012, 10:29:15 UTC |
| d24fbca | Ævar Arnfjörð Bjarmason | 23 December 2011, 17:08:18 UTC | Remove Git's support for smoke testing I'm no longer running the Git smoke testing service at smoke.git.nix.is due to Smolder being a fragile piece of software not having time to follow through on making it easy for third parties to run and submit their own smoke tests. So remove the support in Git for sending smoke tests to smoke.git.nix.is, it's still easy to modify the test suite to submit smokes somewhere else. This reverts the following commits: Revert "t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target" -- e38efac87d Revert "t/README: Document the Smoke testing" -- d15e9ebc5c Revert "t/Makefile: Create test-results dir for smoke target" -- 617344d77b Revert "tests: Infrastructure for Git smoke testing" -- b6b84d1b74 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2012, 10:29:07 UTC |
| 6d62c98 | Ævar Arnfjörð Bjarmason | 20 December 2011, 23:40:47 UTC | Makefile: Change the default compiler from "gcc" to "cc" Ever since the very first commit to git.git we've been setting CC to "gcc". Presumably this is behavior that Linus copied from the Linux Makefile. However unlike Linux Git is written in ANSI C and supports a multitude of compilers, including Clang, Sun Studio, xlc etc. On my Linux box "cc" is a symlink to clang, and on a Solaris box I have access to "cc" is Sun Studio's CC. Both of these are perfectly capable of compiling Git, and it's annoying to have to specify CC=cc on the command-line when compiling Git when that's the default behavior of most other portable programs. So change the default to "cc". Users who want to compile with GCC can still add "CC=gcc" to the make(1) command-line, but those users who don't have GCC as their "cc" will see expected behavior, and as a bonus we'll be more likely to smoke out new compilation warnings from our distributors since they'll me using a more varied set of compilers by default. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2012, 10:28:54 UTC |
| bf5cf76 | Junio C Hamano | 10 February 2012, 22:04:20 UTC | Update draft release notes to 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2012, 22:04:20 UTC |
| 4fed4c8 | Junio C Hamano | 10 February 2012, 21:59:02 UTC | Merge branch 'jc/maint-request-pull-for-tag' into maint * jc/maint-request-pull-for-tag: request-pull: explicitly ask tags/$name to be pulled | 10 February 2012, 21:59:02 UTC |
| 184a7aa | Junio C Hamano | 10 February 2012, 21:59:02 UTC | Merge branch 'tr/grep-l-with-decoration' into maint * tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines | 10 February 2012, 21:59:02 UTC |
| 5febbda | Junio C Hamano | 10 February 2012, 21:59:01 UTC | Merge branch 'jl/submodule-re-add' into maint * jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule | 10 February 2012, 21:59:01 UTC |
| 38ca63f | Junio C Hamano | 10 February 2012, 21:59:01 UTC | Merge branch 'da/maint-mergetool-twoway' into maint * da/maint-mergetool-twoway: mergetool: Provide an empty file when needed | 10 February 2012, 21:59:01 UTC |
| 43ccdf5 | Namhyung Kim | 10 February 2012, 02:13:31 UTC | ctype: implement islower/isupper macro "perf" uses a the forked copy of this file, and wants to use these two macros. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2012, 20:56:29 UTC |
| 1a191a2 | Namhyung Kim | 10 February 2012, 02:13:30 UTC | ctype.c only wants git-compat-util.h The implementation of sane ctype macros only depends on symbols in git-compat-util.h not cache.h Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2012, 20:53:55 UTC |
| ace5e97 | Michael Palimaka | 08 February 2012, 10:59:04 UTC | Explicitly set X to avoid potential build breakage $X is appended to binary names for Windows builds (ie. git.exe). Pollution from the environment can inadvertently trigger this behaviour, resulting in 'git' turning into 'gitwhatever' without warning. Signed-off-by: Michael Palimaka <kensington@astralcloak.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2012, 22:31:48 UTC |
| 3adab6f | Junio C Hamano | 09 February 2012, 21:30:52 UTC | merge: do not launch an editor on "--no-edit $tag" When the user explicitly asked us not to, don't launch an editor. But do everything else the same way as the "edit" case, i.e. leave the comment with verification result in the log template and record the mergesig in the resulting merge commit for later inspection. Based on initiail analysis by Jonathan Nieder. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2012, 21:30:52 UTC |
| 31fd8d7 | Junio C Hamano | 06 February 2012, 18:13:27 UTC | tag: do not show non-tag contents with "-n" "git tag -n" did not check the type of the object it is reading the top n lines from. At least, avoid showing the beginning of trees and blobs when dealing with lightweight tags that point at them. As the payload of a tag and a commit look similar in that they both start with a header block, which is skipped for the purpose of "-n" output, followed by human readable text, allow the message of commit objects to be shown just like the contents of tag objects. This avoids regression for people who have been using "tag -n" to show the log messages of commits that are pointed at by lightweight tags. Test script is from Jeff King. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2012, 04:44:39 UTC |
| 3f6d56d | Junio C Hamano | 07 February 2012, 19:55:48 UTC | commit: ignore intent-to-add entries instead of refusing Originally, "git add -N" was introduced to help users from forgetting to add new files to the index before they ran "git commit -a". As an attempt to help them further so that they do not forget to say "-a", "git commit" to commit the index as-is was taught to error out, reminding the user that they may have forgotten to add the final contents of the paths before running the command. This turned out to be a false "safety" that is useless. If the user made changes to already tracked paths and paths added with "git add -N", and then ran "git add" to register the final contents of the paths added with "git add -N", "git commit" will happily create a commit out of the index, without including the local changes made to the already tracked paths. It was not a useful "safety" measure to prevent "forgetful" mistakes from happening. It turns out that this behaviour is not just a useless false "safety", but actively hurts use cases of "git add -N" that were discovered later and have become popular, namely, to tell Git to be aware of these paths added by "git add -N", so that commands like "git status" and "git diff" would include them in their output, even though the user is not interested in including them in the next commit they are going to make. Fix this ancient UI mistake, and instead make a commit from the index ignoring the paths added by "git add -N" without adding real contents. Based on the work by Nguyễn Thái Ngọc Duy, and helped by injection of sanity from Jonathan Nieder and others on the Git mailing list. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2012, 20:14:40 UTC |
| 701825d | Johannes Schindelin | 07 February 2012, 04:05:48 UTC | add -e: do not show difference in a submodule that is merely dirty When the HEAD of the submodule matches what is recorded in the index of the superproject, and it has local changes or untracked files, the patch offered by "git add -e" for editing shows a diff like this: diff --git a/submodule b/submodule <header> -deadbeef... +deadbeef...-dirty Because applying such a patch has no effect to the index, this is a useless noise. Generate the patch with IGNORE_DIRTY_SUBMODULES flag to prevent such a change from getting reported. This patch also loses the "-dirty" suffix from the output when the HEAD of the submodule is different from what is in the index of the superproject. As such dirtiness expressed by the suffix does not affect the result of the patch application at all, there is no information lost if we remove it. The user could still run "git status" before "git add -e" if s/he cares about the dirtiness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2012, 16:59:40 UTC |
| 33e42de | Matthieu Moy | 06 February 2012, 16:24:52 UTC | fsck: give accurate error message on empty loose object files Since 3ba7a065527a (A loose object is not corrupt if it cannot be read due to EMFILE), "git fsck" on a repository with an empty loose object file complains with the error message fatal: failed to read object <sha1>: Invalid argument This comes from a failure of mmap on this empty file, which sets errno to EINVAL. Instead of calling xmmap on empty file, we display a clean error message ourselves, and return a NULL pointer. The new message is error: object file .git/objects/09/<rest-of-sha1> is empty fatal: loose object <sha1> (stored in .git/objects/09/<rest-of-sha1>) is corrupt The second line was already there before the regression in 3ba7a065527a, and the first is an additional message, that should help diagnosing the problem for the user. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 19:05:36 UTC |
| fb630e0 | Jeff King | 06 February 2012, 08:13:42 UTC | tag: die when listing missing or corrupt objects We don't usually bother looking at tagged objects at all when listing. However, if "-n" is specified, we open the objects to read the annotations of the tags. If we fail to read an object, or if the object has zero length, we simply silently return. The first case is an indication of a broken or corrupt repo, and we should notify the user of the error. The second case is OK to silently ignore; however, the existing code leaked the buffer returned by read_sha1_file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 18:00:51 UTC |
| ca51699 | Jeff King | 06 February 2012, 08:13:12 UTC | tag: fix output of "tag -n" when errors occur When "git tag" is instructed to print lines from annotated tags via "-n", it first prints the tag name, then attempts to parse and print the lines of the tag object, and then finally adds a trailing newline. If an error occurs, we return early from the function and never print the newline, screwing up the output for the next tag. Let's factor the line-printing into its own function so we can manage the early returns better, and make sure that we always terminate the line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 18:00:42 UTC |
| 2d1abfa | Junio C Hamano | 06 February 2012, 08:03:18 UTC | Prepare for 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 08:03:18 UTC |
| 2ff14e3 | Adrian Weimann | 30 January 2012, 19:29:33 UTC | completion: --edit and --no-edit for git-merge Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 08:00:54 UTC |
| f2120eb | Junio C Hamano | 06 February 2012, 07:58:43 UTC | Merge branch 'sp/smart-http-failure-to-push' into maint * sp/smart-http-failure-to-push: remote-curl: Fix push status report when all branches fail | 06 February 2012, 07:58:43 UTC |
| e27d620 | Junio C Hamano | 06 February 2012, 07:58:42 UTC | Merge branch 'jc/maint-log-first-parent-pathspec' into maint * jc/maint-log-first-parent-pathspec: Making pathspec limited log play nicer with --first-parent | 06 February 2012, 07:58:42 UTC |
| 4802997 | Junio C Hamano | 06 February 2012, 07:58:42 UTC | Merge branch 'cb/push-quiet' into maint * cb/push-quiet: t5541: avoid TAP test miscounting fix push --quiet: add 'quiet' capability to receive-pack server_supports(): parse feature list more carefully | 06 February 2012, 07:58:42 UTC |
| 1c719ff | Junio C Hamano | 06 February 2012, 07:58:42 UTC | Merge branch 'cb/maint-kill-subprocess-upon-signal' into maint * cb/maint-kill-subprocess-upon-signal: dashed externals: kill children on exit run-command: optionally kill children on exit | 06 February 2012, 07:58:42 UTC |
| cc811d8 | Junio C Hamano | 06 February 2012, 07:53:21 UTC | Sync with 1.7.6.6 * maint-1.7.8: Git 1.7.6.6 imap-send: remove dead code | 06 February 2012, 07:53:21 UTC |
| d0482e8 | Junio C Hamano | 06 February 2012, 07:52:53 UTC | Sync with 1.7.6.6 * maint-1.7.7: Git 1.7.6.6 imap-send: remove dead code | 06 February 2012, 07:52:53 UTC |
| 110c511 | Junio C Hamano | 06 February 2012, 07:52:25 UTC | Sync with 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:52:25 UTC |
| f174a25 | Junio C Hamano | 06 February 2012, 07:46:44 UTC | Git 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:50:52 UTC |
| 28b22f8 | Jeff King | 06 February 2012, 06:29:37 UTC | imap-send: remove dead code The imap-send code was adapted from another project, and still contains many unused bits of code. One of these bits contains a type "struct string_list" which bears no resemblence to the "struct string_list" we use elsewhere in git. This causes the compiler to complain if git's string_list ever becomes part of cache.h. Let's just drop the dead code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:44:56 UTC |
| c2d17ba | Junio C Hamano | 06 February 2012, 01:13:36 UTC | branch --edit-description: protect against mistyped branch name It is very easy to mistype the branch name when editing its description, e.g. $ git checkout -b my-topic master : work work work : now we are at a good point to switch working something else $ git checkout master : ah, let's write it down before we forget what we were doing $ git branch --edit-description my-tpoic The command does not notice that branch 'my-tpoic' does not exist. It is not lost (it becomes description of an unborn my-tpoic branch), but is not very useful. So detect such a case and error out to reduce the grief factor from this common mistake. This incidentally also errors out --edit-description when the HEAD points at an unborn branch (immediately after "init", or "checkout --orphan"), because at that point, you do not even have any commit that is part of your history and there is no point in describing how this particular branch is different from the branch it forked off of, which is the useful bit of information the branch description is designed to capture. We may want to special case the unborn case later, but that is outside the scope of this patch to prevent more common mistakes before 1.7.9 series gains too much widespread use. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 01:28:03 UTC |
| cd4c4e2 | Ben Walton | 05 February 2012, 22:32:21 UTC | Drop system includes from inet_pton/inet_ntop compatibility wrappers As both of these compatibility wrappers include git-compat-utils.h, all of the system includes were redundant. Dropping these system includes also makes git-compat-utils.h the first include which avoids a compiler warning on Solaris due to the redefinition of _FILE_OFFSET_BITS. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 00:32:33 UTC |
| b5c9f1c | Junio C Hamano | 06 February 2012, 00:22:12 UTC | merge: do not create a signed tag merge under --ff-only option Starting at release v1.7.9, if you ask to merge a signed tag, "git merge" always creates a merge commit, even when the tag points at a commit that happens to be a descendant of your current commit. Unfortunately, this interacts rather badly for people who use --ff-only to make sure that their branch is free of local developments. It used to be possible to say: $ git checkout -b frotz v1.7.9~30 $ git merge --ff-only v1.7.9 and expect that the resulting tip of frotz branch matches v1.7.9^0 (aka the commit tagged as v1.7.9), but this fails with the updated Git with: fatal: Not possible to fast-forward, aborting. because a merge that merges v1.7.9 tag to v1.7.9~30 cannot be created by fast forwarding. We could teach users that now they have to do $ git merge --ff-only v1.7.9^0 but it is far more pleasant for users if we DWIMmed this ourselves. When an integrator pulls in a topic from a lieutenant via a signed tag, even when the work done by the lieutenant happens to fast-forward, the integrator wants to have a merge record, so the integrator will not be asking for --ff-only when running "git pull" in such a case. Therefore, this change should not regress the support for the use case v1.7.9 wanted to add. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 00:30:26 UTC |
| 2c733fb | Junio C Hamano | 02 February 2012, 21:41:43 UTC | parse_date(): '@' prefix forces git-timestamp The only place that the issue this series addresses was observed where we read "cat-file commit" output and put it in GIT_AUTHOR_DATE in order to replay a commit with an ancient timestamp. With the previous patch alone, "git commit --date='20100917 +0900'" can be misinterpreted to mean an ancient timestamp, not September in year 2010. Guard this codepath by requring an extra '@' in front of the raw git timestamp on the parsing side. This of course needs to be compensated by updating get_author_ident_from_commit and the code for "git commit --amend" to prepend '@' to the string read from the existing commit in the GIT_AUTHOR_DATE environment variable. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2012, 07:11:32 UTC |
| 116eb3a | Junio C Hamano | 02 February 2012, 21:41:42 UTC | parse_date(): allow ancient git-timestamp The date-time parser parses out a human-readble datestring piece by piece, so that it could even parse a string in a rather strange notation like 'noon november 11, 2005', but restricts itself from parsing strings in "<seconds since epoch> <timezone>" format only for reasonably new timestamps (like 1974 or newer) with 10 or more digits. This is to prevent a string like "20100917" from getting interpreted as seconds since epoch (we want to treat it as September 17, 2010 instead) while doing so. The same codepath is used to read back the timestamp that we have already recorded in the headers of commit and tag objects; because of this, such a commit with timestamp "0 +0000" cannot be rebased or amended very easily. Teach parse_date() codepath to special case a string of the form "<digits> +<4-digits>" to work this issue around, but require that there is no other cruft around the string when parsing a timestamp of this format for safety. Note that this has a slight backward incompatibility implications. If somebody writes "git commit --date='20100917 +0900'" and wants it to mean a timestamp in September 2010 in Japan, this change will break such a use case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2012, 07:11:32 UTC |
| 3a9f58c | Jakub Narebski | 03 February 2012, 21:49:07 UTC | git.spec: Workaround localized messages not put in any RPM Currently building git RPM from tarball results in the following error: RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/locale/is/LC_MESSAGES/git.mo This is caused by the fact that localized messages do not have their place in some RPM package. Let's postpone decision where they should be put (be it git-i18n-Icelandic, or git-i18n, or git package itself) for later by removing locale files at the end of install phase. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2012, 07:06:30 UTC |
| 840c519 | Junio C Hamano | 04 February 2012, 06:29:01 UTC | tests: add write_script helper function Many of the scripts in the test suite write small helper shell scripts to disk. It's best if these shell scripts start with "#!$SHELL_PATH" rather than "#!/bin/sh", because /bin/sh on some platforms is too buggy to be used. However, it can be cumbersome to expand $SHELL_PATH, because the usual recipe for writing a script is: cat >foo.sh <<-\EOF #!/bin/sh echo my arguments are "$@" EOF To expand $SHELL_PATH, you have to either interpolate the here-doc (which would require quoting "\$@"), or split the creation into two commands (interpolating the $SHELL_PATH line, but not the rest of the script). Let's provide a helper function that makes that less syntactically painful. While we're at it, this helper can also take care of the "chmod +x" that typically comes after the creation of such a script, saving the caller a line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2012, 07:01:07 UTC |
| 84d7273 | Jeff King | 03 February 2012, 22:16:02 UTC | prompt: fall back to terminal if askpass fails The current askpass code simply dies if calling an askpass helper fails. Worse, in some failure modes it doesn't even print an error (if start_command fails, then it prints its own error; if reading fails, we print an error; but if the command exits non-zero, finish_command fails and we print nothing!). Let's be more kind to the user by printing an error message when askpass doesn't work out, and then falling back to the terminal (which also may fail, of course, but we die already there with a nice message). While we're at it, let's clean up the existing error messages a bit. Now that our prompts are very long and contain quotes and colons themselves, our error messages are hard to read. So the new failure modes look like: [before, with a terminal] $ GIT_ASKPASS=false git push $ echo $? 128 [before, with no terminal, and we must give up] $ setsid git push fatal: could not read 'Password for 'https://peff@github.com': ': No such device or address [after, with a terminal] $ GIT_ASKPASS=false git push error: unable to read askpass response from 'false' Password for 'https://peff@github.com': [after, with no terminal, and we must give up] $ GIT_ASKPASS=false setsid git push error: unable to read askpass response from 'false' fatal: could not read Password for 'https://peff@github.com': No such device or address Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2012, 22:37:04 UTC |
| 31b49d9 | Jeff King | 03 February 2012, 22:14:11 UTC | prompt: clean up strbuf usage The do_askpass function inherited a few bad habits from the original git_getpass. One, there's no need to strbuf_reset a buffer which was just initialized. And two, it's a good habit to use strbuf_detach to claim ownership of a buffer's string (even though in this case the owning buffer goes out of scope, so it's effectively the same thing). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2012, 22:37:02 UTC |
| 84d9e2d | Jakub Narebski | 03 February 2012, 12:44:54 UTC | gitweb: Allow UTF-8 encoded CGI query parameters and path_info Gitweb forgot to turn query parameters into UTF-8. This results in a bug that one cannot search for a string with characters outside US-ASCII. For example searching for "Michał Kiedrowicz" (containing letter 'ł' - LATIN SMALL LETTER L WITH STROKE, with Unicode codepoint U+0142, represented with 0xc5 0x82 bytes in UTF-8 and percent-encoded as %C5%82) result in the following incorrect data in search field MichaÅ\202 Kiedrowicz This is caused by CGI by default treating '0xc5 0x82' bytes as two characters in Perl legacy encoding latin-1 (iso-8859-1), because 's' query parameter is not processed explicitly as UTF-8 encoded string. The solution used here follows "Using Unicode in a Perl CGI script" article on http://www.lemoda.net/cgi/perl-unicode/index.html: use CGI; use Encode 'decode_utf8; my $value = params('input'); $value = decode_utf8($value); Decoding UTF-8 is done when filling %input_params hash and $path_info variable; the former requires to move from explicit $cgi->param(<label>) to $input_params{<name>} in a few places, which is a good idea anyway. Also add -override=>1 parameter to $cgi->textfield() invocation in search form. Otherwise CGI would use values from query string if it is present, filling value from $cgi->param... without decode_utf8(). As we are using value of appropriate parameter anyway, -override=>1 doesn't change the situation but makes gitweb fill search field correctly. We could simply use the '-utf8' pragma (via "use CGI '-utf8';") to solve this, but according to CGI.pm documentation, it may cause problems with POST requests containing binary files, and it requires CGI 3.31 (I think), released with perl v5.8.9. Reported-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Jakub Narębski <jnareb@gmail.com> Tested-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2012, 21:03:08 UTC |
| 8a5b749 | Jiang Xin | 02 February 2012, 02:02:23 UTC | i18n: format_tracking_info "Your branch is behind" message Function format_tracking_info in remote.c is called by wt_status_print_tracking in wt-status.c, which will print branch tracking message in git-status. git-checkout also show these messages through it's report_tracking function. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2012, 02:09:17 UTC |
| be39de2 | Jiang Xin | 01 February 2012, 17:20:30 UTC | i18n: git-commit whence_s "merge/cherry-pick" message Mark the "merge/cherry-pick" messages in whence_s for translation. These messages returned from whence_s function are used as argument to build other messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2012, 23:46:24 UTC |
| 2ad9ba0 | Junio C Hamano | 01 February 2012, 05:06:06 UTC | request-pull: explicitly ask tags/$name to be pulled When asking for a tag to be pulled, disambiguate by leaving tags/ prefix in front of the name of the tag. E.g. ... in the git repository at: git://example.com/git/git.git/ tags/v1.2.3 for you to fetch changes up to 123456... This way, older versions of "git pull" can be used to respond to such a request more easily, as "git pull $URL v1.2.3" did not DWIM to fetch v1.2.3 tag in older versions. Also this makes it clearer for humans that the pull request is made for a tag and he should anticipate a signed one. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2012, 05:27:58 UTC |
| 48c07d8 | Ralf Thielow | 29 January 2012, 12:55:33 UTC | completion: --edit-description option for git-branch Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2012, 21:30:58 UTC |
| 828ea97 | Junio C Hamano | 27 January 2012, 19:31:02 UTC | Git 1.7.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2012, 19:31:02 UTC |
| 634a5f2 | Junio C Hamano | 27 January 2012, 05:48:33 UTC | INSTALL: warn about recent Fedora breakage Recent releases of Redhat/Fedora are reported to ship Perl binary package with some core modules stripped away (see http://lwn.net/Articles/477234/) against the upstream Perl5 people's wishes. The Time::HiRes module used by gitweb one of them. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2012, 05:51:29 UTC |
| f15026b | Felipe Contreras | 25 January 2012, 01:37:02 UTC | git-completion: workaround zsh COMPREPLY bug zsh adds a backslash (foo\ ) for each item in the COMPREPLY array if IFS doesn't contain spaces. This issue has been reported[1], but there is no solution yet. This wasn't a problem due to another bug[2], which was fixed in zsh version 4.3.12. After this change, 'git checkout ma<tab>' would resolve to 'git checkout master\ '. Aditionally, the introduction of __gitcomp_nl in commit a31e626 (completion: optimize refs completion) in git also made the problem apparent, as Matthieu Moy reported. The simplest and most generic solution is to hide all the changes we do to IFS, so that "foo \nbar " is recognized by zsh as "foo bar". This works on versions of git before and after the introduction of __gitcomp_nl (a31e626), and versions of zsh before and after 4.3.12. Once zsh is fixed, we should conditionally disable this workaround to have the same benefits as bash users. [1] http://www.zsh.org/mla/workers/2012/msg00053.html [2] http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=2e25dfb8fd38dbef0a306282ffab1d343ce3ad8d Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2012, 22:03:51 UTC |
| 7331374 | Jeff King | 25 January 2012, 22:20:03 UTC | docs: minor grammar fixes for v1.7.9 release notes Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2012, 19:09:08 UTC |
| 1017c1a | Jens Lehmann | 24 January 2012, 21:49:56 UTC | submodule add: fix breakage when re-adding a deep submodule Since recently a submodule with name <name> has its git directory in the .git/modules/<name> directory of the superproject while the work tree contains a gitfile pointing there. When the same submodule is added on a branch where it wasn't present so far (it is not found in the .gitmodules file), the name is not initialized from the path as it should. This leads to a wrong path entered in the gitfile when the .git/modules/<name> directory is found, as this happily uses the - now empty - name. It then always points only a single directory up, even if we have a path deeper in the directory hierarchy. Fix that by initializing the name of the submodule early in module_clone() if module_name() returned an empty name and add a test to catch that bug. Reported-by: Jehan Bing <jehan@orb.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 January 2012, 22:18:18 UTC |
| ec245ba | David Aguilar | 20 January 2012, 07:47:35 UTC | mergetool: Provide an empty file when needed Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE are missing. $BASE can be missing when two branches independently add the same filename. Provide an empty file to make these tools happy. When a delete/modify conflict occurs, $LOCAL and $REMOTE can also be missing. We have special case code to handle such case so this change may not affect that codepath, but try to be consistent and create an empty file for them anyway. Reported-by: Jason Wenger <jcwenger@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2012, 19:50:22 UTC |
| 50dd0f2 | Albert Yale | 23 January 2012, 17:52:44 UTC | grep: fix -l/-L interaction with decoration lines In threaded mode, git-grep emits file breaks (enabled with context, -W and --break) into the accumulation buffers even if they are not required. The output collection thread then uses skip_first_line to skip the first such line in the output, which would otherwise be at the very top. This is wrong when the user also specified -l/-L/-c, in which case every line is relevant. While arguably giving these options together doesn't make any sense, git-grep has always quietly accepted it. So do not skip anything in these cases. Signed-off-by: Albert Yale <surfingalbert@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2012, 18:49:34 UTC |
| 69204d0 | Michael Haggerty | 23 January 2012, 12:09:58 UTC | Fix typo in 1.7.9 release notes Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2012, 18:11:13 UTC |
| 5238cbf | Shawn O. Pearce | 20 January 2012, 03:12:09 UTC | remote-curl: Fix push status report when all branches fail The protocol between transport-helper.c and remote-curl requires remote-curl to always print a blank line after the push command has run. If the blank line is ommitted, transport-helper kills its container process (the git push the user started) with exit(128) and no message indicating a problem, assuming the helper already printed reasonable error text to the console. However if the remote rejects all branches with "ng" commands in the report-status reply, send-pack terminates with non-zero status, and in turn remote-curl exited with non-zero status before outputting the blank line after the helper status printed by send-pack. No error messages reach the user. This caused users to see the following from git push over HTTP when the remote side's update hook rejected the branch: $ git push http://... master Counting objects: 4, done. Delta compression using up to 6 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 301 bytes, done. Total 3 (delta 0), reused 0 (delta 0) $ Always print a blank line after the send-pack process terminates, ensuring the helper status report (if it was output) will be correctly parsed by the calling transport-helper.c. This ensures the helper doesn't abort before the status report can be shown to the user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2012, 18:14:32 UTC |
| 36ed191 | Junio C Hamano | 19 January 2012, 19:58:45 UTC | Making pathspec limited log play nicer with --first-parent In a topic branch workflow, you often want to find the latest commit that merged a side branch that touched a particular area of the system, so that a new topic branch to work on that area can be forked from that commit. For example, I wanted to find an appropriate fork-point to queue Luke's changes related to git-p4 in contrib/fast-import/. "git log --first-parent" traverses the first-parent chain, and "-m --stat" shows the list of paths touched by commits including merge commits. We could ask the question this way: # What is the latest commit that touched that path? $ git log --first-parent --oneline -m --stat master | sed -e '/^ contrib\/fast-import\/git-p4 /q' | tail The above finds that 8cbfc11 (Merge branch 'pw/p4-view-updates', 2012-01-06) was such a commit. But a more natural way to spell this question is this: $ git log --first-parent --oneline -m --stat -1 master -- \ contrib/fast-import/git-p4 Unfortunately, this does not work. It finds ecb7cf9 (git-p4: rewrite view handling, 2012-01-02). This commit is a part of the merged topic branch and is _not_ on the first-parent path from the 'master': $ git show-branch 8cbfc11 ecb7cf9 ! [8cbfc11] Merge branch 'pw/p4-view-updates' ! [ecb7cf9] git-p4: rewrite view handling -- - [8cbfc11] Merge branch 'pw/p4-view-updates' + [8cbfc11^2] git-p4: view spec documentation ++ [ecb7cf9] git-p4: rewrite view handling The problem is caused by the merge simplification logic when it inspects the merge commit 8cbfc11. In this case, the history leading to the tip of 'master' did not touch git-p4 since 'pw/p4-view-updates' topic forked, and the result of the merge is simply a copy from the tip of the topic branch in the view limited by the given pathspec. The merge simplification logic discards the history on the mainline side of the merge, and pretends as if the sole parent of the merge is its second parent, i.e. the tip of the topic. While this simplification is correct in the general case, it is at least surprising if not outright wrong when the user explicitly asked to show the first-parent history. Here is an attempt to fix this issue, by not allowing us to compare the merge result with anything but the first parent when --first-parent is in effect, to avoid the history traversal veering off to the side branch. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2012, 00:18:27 UTC |
| bddcefc | Junio C Hamano | 18 January 2012, 23:53:35 UTC | Git 1.7.9-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:53:35 UTC |
| 6e06367 | Junio C Hamano | 18 January 2012, 23:52:08 UTC | Merge branch 'maint' * maint: Git 1.7.8.4 Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN | 18 January 2012, 23:52:08 UTC |
| c572f49 | Junio C Hamano | 18 January 2012, 23:51:00 UTC | Git 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:51:00 UTC |
| d899cf5 | Junio C Hamano | 18 January 2012, 23:48:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN | 18 January 2012, 23:48:46 UTC |
| 0065343 | Junio C Hamano | 18 January 2012, 23:46:31 UTC | Git 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:46:31 UTC |
| 5c8eeb8 | Nguyen Thai Ngoc Duy | 15 January 2012, 10:03:27 UTC | diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:44:02 UTC |
| 32c94f9 | Junio C Hamano | 18 January 2012, 23:18:02 UTC | Merge branch 'jc/pull-signed-tag-doc' * jc/pull-signed-tag-doc: pulling signed tag: add howto document | 18 January 2012, 23:18:02 UTC |
| 11b17af | Junio C Hamano | 17 January 2012, 22:52:24 UTC | pulling signed tag: add howto document Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:17:27 UTC |
| 1a22780 | Junio C Hamano | 18 January 2012, 23:16:53 UTC | Merge branch 'jk/credentials' * jk/credentials: credential-cache: ignore "connection refused" errors unix-socket: do not let close() or chdir() clobber errno during cleanup credential-cache: report more daemon connection errors unix-socket: handle long socket pathnames | 18 January 2012, 23:16:53 UTC |
| c74f97a | Junio C Hamano | 18 January 2012, 23:16:43 UTC | Merge branch 'nd/pathspec-recursion-cleanup' * nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards | 18 January 2012, 23:16:43 UTC |
| 8ef7933 | Junio C Hamano | 18 January 2012, 23:16:23 UTC | Merge branch 'mh/maint-show-ref-doc' * mh/maint-show-ref-doc: git-show-ref doc: typeset regexp in fixed width font git-show-ref: fix escaping in asciidoc source | 18 January 2012, 23:16:23 UTC |
| 05c65cb | Junio C Hamano | 18 January 2012, 23:16:19 UTC | Merge branch 'tr/maint-word-diff-incomplete-line' * tr/maint-word-diff-incomplete-line: word-diff: ignore '\ No newline at eof' marker | 18 January 2012, 23:16:19 UTC |
| 35a71f1 | Jeff King | 17 January 2012, 06:02:32 UTC | credential-cache: ignore "connection refused" errors The credential-cache helper will try to connect to its daemon over a unix socket. Originally, a failure to do so was silently ignored, and we would either give up (if performing a "get" or "erase" operation), or spawn a new daemon (for a "store" operation). But since 8ec6c8d, we try to report more errors. We detect a missing daemon by checking for ENOENT on our connection attempt. If the daemon is missing, we continue as before (giving up or spawning a new daemon). For any other error, we die and report the problem. However, checking for ENOENT is not sufficient for a missing daemon. We might also get ECONNREFUSED if a dead daemon process left a stale socket. This generally shouldn't happen, as the daemon cleans up after itself, but the daemon may not always be given a chance to do so (e.g., power loss, "kill -9"). The resulting state is annoying not just because the helper outputs an extra useless message, but because it actually blocks the helper from spawning a new daemon to replace the stale socket. Fix it by checking for ECONNREFUSED. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 January 2012, 06:15:19 UTC |
| b63103e | Junio C Hamano | 17 January 2012, 00:45:56 UTC | Merge branch 'jn/maint-gitweb-grep-fix' * jn/maint-gitweb-grep-fix: gitweb: Harden "grep" search against filenames with ':' gitweb: Fix file links in "grep" search | 17 January 2012, 00:45:56 UTC |
| 4838237 | Nguyen Thai Ngoc Duy | 15 January 2012, 10:03:27 UTC | diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2012, 22:17:18 UTC |
| 8c69c1f | Nguyễn Thái Ngọc Duy | 14 January 2012, 09:23:22 UTC | Document limited recursion pathspec matching with wildcards It's actually unlimited recursion if wildcards are active regardless --max-depth Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2012, 02:39:04 UTC |
| 87b340b | Michael Haggerty | 13 January 2012, 16:39:16 UTC | git-show-ref doc: typeset regexp in fixed width font Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 17:50:45 UTC |
| 6ab2608 | Michael Haggerty | 13 January 2012, 16:39:15 UTC | git-show-ref: fix escaping in asciidoc source Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are not recognized). Spell "{}" consistently, namely *not* quoted as "\{\}". Since the braces are empty, they cannot be interpreted as an attribute reference, and either spelling is OK. So arbitrarily choose one variation and use it consistently. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 17:50:17 UTC |
| 6db5c6e | Junio C Hamano | 13 January 2012, 07:43:28 UTC | Git 1.7.9-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:43:28 UTC |
| 478c446 | Junio C Hamano | 13 January 2012, 07:34:30 UTC | Merge branch 'jc/request-pull-show-head-4' * jc/request-pull-show-head-4: request-pull: use the real fork point when preparing the message | 13 January 2012, 07:34:30 UTC |
| b51ffa8 | Junio C Hamano | 13 January 2012, 07:34:26 UTC | Merge branch 'tr/maint-mailinfo' * tr/maint-mailinfo: mailinfo documentation: accurately describe non -k case | 13 January 2012, 07:34:26 UTC |
| 96e3360 | Junio C Hamano | 13 January 2012, 07:34:21 UTC | Merge branch 'ss/maint-msys-cvsexportcommit' * ss/maint-msys-cvsexportcommit: git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS t9200: On MSYS, do not pass Windows-style paths to CVS | 13 January 2012, 07:34:21 UTC |
| bdb8cb5 | Junio C Hamano | 13 January 2012, 07:34:17 UTC | Merge branch 'jk/maint-upload-archive' * jk/maint-upload-archive: archive: re-allow HEAD:Documentation on a remote invocation | 13 January 2012, 07:34:17 UTC |
| c4a01a3 | Junio C Hamano | 13 January 2012, 07:33:39 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.7.8.4 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:33:39 UTC |
| ab8a780 | Junio C Hamano | 13 January 2012, 07:33:29 UTC | Update draft release notes to 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:33:29 UTC |
| 5a6a939 | Junio C Hamano | 13 January 2012, 07:31:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:31:46 UTC |
| 8f83acf | Junio C Hamano | 13 January 2012, 07:31:41 UTC | Update draft release notes to 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:31:41 UTC |
