| 5c41531 | Junio C Hamano | 25 January 2009, 20:41:09 UTC | GIT 1.6.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 January 2009, 20:41:09 UTC |
| 692be9f | Junio C Hamano | 24 January 2009, 03:06:38 UTC | Merge branch 'cb/maint-unpack-trees-absense' into maint * cb/maint-unpack-trees-absense: unpack-trees: remove redundant path search in verify_absent unpack-trees: fix path search bug in verify_absent unpack-trees: handle failure in verify_absent | 24 January 2009, 03:06:38 UTC |
| f630171 | Junio C Hamano | 24 January 2009, 03:04:48 UTC | Merge branch 'tr/maint-no-index-fixes' into maint * tr/maint-no-index-fixes: diff --no-index -q: fix endless loop diff --no-index: test for pager after option parsing diff: accept -- when using --no-index | 24 January 2009, 03:04:48 UTC |
| 46cdcc6 | Junio C Hamano | 24 January 2009, 03:03:50 UTC | Merge branch 'rs/maint-shortlog-foldline' into maint * rs/maint-shortlog-foldline: shortlog: handle multi-line subjects like log --pretty=oneline et. al. do | 24 January 2009, 03:03:50 UTC |
| 67b175b | Junio C Hamano | 24 January 2009, 03:02:58 UTC | Merge branch 'pj/maint-ldflags' into maint * pj/maint-ldflags: configure clobbers LDFLAGS | 24 January 2009, 03:02:58 UTC |
| e5bde19 | Junio C Hamano | 24 January 2009, 03:02:41 UTC | Merge branch 'pb/maint-git-pm-false-dir' into maint * pb/maint-git-pm-false-dir: Git.pm: correctly handle directory name that evaluates to "false" | 24 January 2009, 03:02:41 UTC |
| e2355a3 | Junio C Hamano | 24 January 2009, 03:01:32 UTC | Merge branch 'js/maint-bisect-gitk' into maint * js/maint-bisect-gitk: bisect view: call gitk if Cygwin's SESSIONNAME variable is set | 24 January 2009, 03:01:32 UTC |
| 9e3248e | Junio C Hamano | 24 January 2009, 03:00:43 UTC | Merge branch 'js/add-not-submodule' into maint * js/add-not-submodule: git add: do not add files from a submodule | 24 January 2009, 03:00:43 UTC |
| 5cb0f27 | Junio C Hamano | 24 January 2009, 02:59:59 UTC | Merge branch 'jc/maint-format-patch' into maint * jc/maint-format-patch: format-patch: show patch text for the root commit | 24 January 2009, 02:59:59 UTC |
| d4029d3 | Junio C Hamano | 24 January 2009, 02:59:26 UTC | Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: avoid using undefined parameters Documentation: mention branches rather than heads Documentation: remove a redundant elaboration Documentation: git push repository can also be a remote | 24 January 2009, 02:59:26 UTC |
| b619715 | Junio C Hamano | 24 January 2009, 02:48:14 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fix Documentation for git-describe | 24 January 2009, 02:48:14 UTC |
| b938f62 | Boyd Stephen Smith Jr | 22 January 2009, 18:26:25 UTC | Fix Documentation for git-describe The documentation for git-describe says the default abbreviation is 8 hexadecimal digits while cache.c clearly shows DEFAULT_ABBREV set to 7. This patch corrects the documentation. Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2009, 08:17:04 UTC |
| 950db87 | Johannes Schindelin | 20 January 2009, 21:08:33 UTC | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty All the other config variables use CamelCase. This config variable should not be an exception. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2009, 08:17:40 UTC |
| 674a1d2 | Lars Noschinski | 19 January 2009, 17:06:43 UTC | shell: Document that 'cvs server' is a valid command git-shell's man page explicitly lists all allowed commands, but 'cvs server' was missing. Add it. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2009, 01:07:23 UTC |
| 69274b6 | Anders Melchiorsen | 18 January 2009, 14:36:58 UTC | Documentation: avoid using undefined parameters The <ref> parameter has not been introduced, so rewrite to avoid it. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:29:37 UTC |
| 89edd5a | Anders Melchiorsen | 18 January 2009, 14:36:57 UTC | Documentation: mention branches rather than heads The "matching refs" semantics works only on matching branches these days. Instead of using "heads" which traditionally has been used more or less interchangeably with "refs", say "branch" explicitly here. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:52 UTC |
| 391d186 | Anders Melchiorsen | 18 January 2009, 14:36:56 UTC | Documentation: remove a redundant elaboration The comment in parentheses is wrong, as one has to leave out both the colon and <dst>. This situation is covered by the section a few lines down: A parameter <ref> without a colon pushes the <ref> from the source repository to the destination repository under the same name. So, just remove the parentheses. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:03 UTC |
| 98347fe | Anders Melchiorsen | 18 January 2009, 14:36:55 UTC | Documentation: git push repository can also be a remote This is copied from pull-fetch-param.txt and helps the reader to not get stuck in the URL section. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:02 UTC |
| 9d3043c | Junio C Hamano | 18 January 2009, 07:04:35 UTC | Update draft release notes for 1.6.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 07:04:35 UTC |
| 78f111e | Junio C Hamano | 18 January 2009, 06:39:49 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: builtin-fsck: fix off by one head count Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG | 18 January 2009, 06:39:49 UTC |
| 3aed2fd | Christian Couder | 18 January 2009, 03:46:09 UTC | builtin-fsck: fix off by one head count According to the man page, if "git fsck" is passed one or more heads, it should verify connectivity and validity of only objects reachable from the heads it is passed. However, since 5ac0a20 (Make builtin-fsck.c use parse_options., 2007-10-15) the command behaved as if no heads were passed, when given only one argument. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 06:37:41 UTC |
| 8ee09ac | Johannes Schindelin | 17 January 2009, 15:41:41 UTC | t5540: clarify that http-push does not handle packed-refs on the remote Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:20:00 UTC |
| 466ddf9 | Johannes Schindelin | 17 January 2009, 15:11:51 UTC | http-push: when making directories, have a trailing slash in the path name The function lock_remote() sends MKCOL requests to make leading directories; However, if it does not put a forward slash '/' at the end of the path, the server sends a 301 redirect. By leaving the '/' in place, we can avoid this additional step. Incidentally, at least one version of Curl (7.16.3) does not resend credentials when it follows a 301 redirect, so this commit also fixes a bug. Original patch by Tay Ray Chuan <rctay89@gmail.com>. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:19:46 UTC |
| 2064280 | Johannes Schindelin | 17 January 2009, 15:36:26 UTC | http-push: fix off-by-path_len When getting the result of remote_ls(), we were advancing the variable "path" to the relative path inside the repository. However, then we went on to malloc a bogus amount of memory: we were subtracting the prefix length _again_, quite possibly getting something negative, which xmalloc() interprets as really, really much. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:19:35 UTC |
| bf474e2 | Markus Heidelberg | 16 January 2009, 21:42:33 UTC | Documentation: let asciidoc align related options Command line options can share the same paragraph of description, if they are related or synonymous. In these cases they should be written among each other, so that asciidoc can format them itself. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:01:46 UTC |
| 9968696 | Stephan Beyer | 16 January 2009, 20:36:06 UTC | githooks.txt: add missing word Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:41 UTC |
| 2454ac7 | Stephan Beyer | 16 January 2009, 19:40:05 UTC | builtin-commit.c: do not remove COMMIT_EDITMSG git-commit tries to remove the file ./COMMIT_EDITMSG instead of $GIT_DIR/COMMIT_EDITMSG after commit preparation (e.g. running hooks, launching editor). This behavior exists since f5bbc3225c4b07 "Port git commit to C". Some test cases (e.g. t/t7502-commit.sh) rely on the existence of $GIT_DIR/COMMIT_EDITMSG after committing and, I guess, many people are used to it. So it is best not to remove it. This patch just removes the removal of COMMIT_EDITMSG. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:35 UTC |
| ebb7bbf | Junio C Hamano | 15 January 2009, 22:33:54 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: t3404: Add test case for auto-amending only edited commits after "edit" t3404: Add test case for aborted --continue after "edit" t3501: check that commits are actually done | 15 January 2009, 22:33:54 UTC |
| f8aa1b6 | Stephan Beyer | 15 January 2009, 12:56:16 UTC | t3404: Add test case for auto-amending only edited commits after "edit" Add a test case for the bugfix introduced by commit c14c3c82d "git-rebase--interactive: auto amend only edited commit". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:53 UTC |
| dc7f55c | Stephan Beyer | 15 January 2009, 12:56:15 UTC | t3404: Add test case for aborted --continue after "edit" Add a test case for the bugfix introduced by commit 8beb1f33d "git-rebase-interactive: do not squash commits on abort". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:42 UTC |
| 944019c | Stephan Beyer | 15 January 2009, 13:03:17 UTC | t3501: check that commits are actually done The basic idea of t3501 is to check whether revert and cherry-pick works on renamed files. But as there is no pure cherry-pick/revert test, it is good to also check if commits are actually done in that scenario. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:12 UTC |
| eb475bf | Junio C Hamano | 15 January 2009, 06:43:04 UTC | Update draft release notes to 1.6.1.1 | 15 January 2009, 06:43:04 UTC |
| 914186a | Junio C Hamano | 15 January 2009, 06:34:05 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: fix handling of multiple untracked files for git mv -k add test cases for "git mv -k" | 15 January 2009, 06:34:05 UTC |
| 8dca683 | Miklos Vajna | 15 January 2009, 00:33:19 UTC | Make t3411 executable Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 01:00:00 UTC |
| be17262 | Michael J Gruber | 14 January 2009, 17:03:22 UTC | fix handling of multiple untracked files for git mv -k The "-k" option to "git mv" should allow specifying multiple untracked files. Currently, multiple untracked files raise an assertion if they appear consecutively as arguments. Fix this by decrementing the loop index after removing one entry from the array of arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:34:22 UTC |
| 3772923 | Michael J Gruber | 14 January 2009, 17:03:21 UTC | add test cases for "git mv -k" Add test cases for ignoring nonexisting and untracked files using the -k option to "git mv". There is one known breakage related to multiple untracked files specfied as consecutive arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:29:24 UTC |
| 4f8b899 | Junio C Hamano | 14 January 2009, 07:10:50 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: fast-import: Cleanup mode setting. Git.pm: call Error::Simple() properly | 14 January 2009, 07:10:50 UTC |
| 3d1d81e | Felipe Contreras | 14 January 2009, 01:37:07 UTC | fast-import: Cleanup mode setting. "S_IFREG | mode" makes only sense for 0644 and 0755. Even though doing (S_IFREG | mode) may not hurt when mode is any other supported value, that is only true because S_IFREG mode bit happens to be already on for S_IFLNK or S_IFGITLINK. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:57:12 UTC |
| 8faea4f | Jay Soffian | 13 January 2009, 22:41:35 UTC | Git.pm: call Error::Simple() properly The error message to Error::Simple() must be passed as a single argument. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:52:35 UTC |
| 885a1ff | Junio C Hamano | 13 January 2009, 09:15:49 UTC | Merge branch 'kk/maint-http-push' into maint * kk/maint-http-push: http-push: support full URI in handle_remote_ls_ctx() | 13 January 2009, 09:15:49 UTC |
| 94468bc | Junio C Hamano | 13 January 2009, 09:15:19 UTC | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint * js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged | 13 January 2009, 09:15:19 UTC |
| 9e8f6e7 | Junio C Hamano | 13 January 2009, 09:13:56 UTC | Merge branch 'cb/maint-merge-recursive-fix' into maint * cb/maint-merge-recursive-fix: merge-recursive: do not clobber untracked working tree garbage modify/delete conflict resolution overwrites untracked file Conflicts: builtin-merge-recursive.c | 13 January 2009, 09:13:56 UTC |
| ae5a97f | Junio C Hamano | 13 January 2009, 08:56:40 UTC | Merge branch 'ap/maint-apply-modefix' into maint * ap/maint-apply-modefix: builtin-apply: prevent non-explicit permission changes | 13 January 2009, 08:56:40 UTC |
| 1cbe69f | Junio C Hamano | 13 January 2009, 08:40:19 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Avoid spurious error messages on error mistakes. contrib/examples/README: give an explanation of the status of these files | 13 January 2009, 08:40:19 UTC |
| 12dd111 | Pierre Habouzit | 12 January 2009, 23:09:36 UTC | Avoid spurious error messages on error mistakes. Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 08:21:31 UTC |
| 47a845b | jidanni@jidanni.org | 13 January 2009, 01:19:42 UTC | contrib/examples/README: give an explanation of the status of these files We attempt to give an explanation of the status of the files in this directory. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 01:47:36 UTC |
| 9279bf3 | Junio C Hamano | 12 January 2009, 07:27:29 UTC | Merge branch 'mh/maint-sendmail-cc-doc' into maint * mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable | 12 January 2009, 07:27:29 UTC |
| 687004b | Junio C Hamano | 12 January 2009, 07:24:42 UTC | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint * jc/maint-do-not-switch-to-non-commit: git checkout: do not allow switching to a tree-ish that is not a commit | 12 January 2009, 07:24:42 UTC |
| 4fc988e | jidanni@jidanni.org | 12 January 2009, 03:05:54 UTC | Documentation/git-push.txt: minor: compress one option Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2009, 05:47:26 UTC |
| 68c2ec7 | Junio C Hamano | 10 January 2009, 20:41:33 UTC | format-patch: show patch text for the root commit Even without --root specified, if the range given on the command line happens to include a root commit, we should include its patch text in the output. This fix deliberately ignores log.showroot configuration variable because "format-patch" and "log -p" can and should behave differently in this case, as the former is about exporting a part of your history in a form that is replayable elsewhere and just giving the commit log message without the patch text does not make any sense for that purpose. Noticed and fix originally attempted by Nathan W. Panike; credit goes to Alexander Potashev for injecting sanity to my initial (broken) fix that used the value from log.showroot configuration, which was misguided. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2009, 01:40:57 UTC |
| a324fc4 | Thomas Rast | 07 January 2009, 11:15:30 UTC | diff --no-index -q: fix endless loop We forgot to move to the next argument when parsing -q, getting stuck in an endless loop. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 20:04:38 UTC |
| c6dbca0 | Thomas Rast | 06 January 2009, 23:56:03 UTC | diff --no-index: test for pager after option parsing We need to parse options before we can see if --exit-code was provided. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 07:40:02 UTC |
| e423ffd | Thomas Rast | 06 January 2009, 18:53:32 UTC | diff: accept -- when using --no-index Accept -- as an "end of options" marker even when using --no-index. Previously, the -- triggered a "normal" index/tree diff and subsequently failed because of the unrecognized (in that mode) --no-index. Note that the second loop can treat '--' as a normal option, because the preceding checks ensure it is the third-to-last argument. While at it, fix the parsing of "-q" option in --no-index mode as well. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 07:18:20 UTC |
| 152d70f | Junio C Hamano | 07 January 2009, 06:12:35 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: README: tutorial.txt is now called gittutorial.txt | 07 January 2009, 06:12:35 UTC |
| 141201d | Junio C Hamano | 07 January 2009, 06:12:30 UTC | Merge branch 'maint-1.5.6' into maint-1.6.0 * maint-1.5.6: README: tutorial.txt is now called gittutorial.txt | 07 January 2009, 06:12:30 UTC |
| 8a124b8 | Joey Hess | 07 January 2009, 04:23:37 UTC | README: tutorial.txt is now called gittutorial.txt Signed-off-by: Joey Hess <joey@gnu.kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 06:12:07 UTC |
| cec0871 | René Scharfe | 06 January 2009, 20:41:06 UTC | shortlog: handle multi-line subjects like log --pretty=oneline et. al. do The commit message parser of git shortlog used to treat only the first non-empty line of the commit message as the subject. Other log commands (e.g. --pretty=oneline) show the whole first paragraph instead (unwrapped into a single line). For consistency, this patch borrows format_subject() from pretty.c to make shortlog do the same. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 06:06:07 UTC |
| 50a4b35 | Paul Jarc | 05 January 2009, 02:27:41 UTC | configure clobbers LDFLAGS In a couple of tests, configure clobbers the LDFLAGS value set by the caller. This patch fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2009, 03:46:19 UTC |
| 7b9e3ce | Clemens Buchacher | 01 January 2009, 20:54:33 UTC | unpack-trees: remove redundant path search in verify_absent Since the only caller, verify_absent, relies on the fact that o->pos points to the next index entry anyways, there is no need to recompute its position. Furthermore, if a nondirectory entry were found, this would return too early, because there could still be an untracked directory in the way. This is currently not a problem, because verify_absent is only called if the index does not have this entry. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:48:43 UTC |
| 837e5fe | Clemens Buchacher | 01 January 2009, 20:54:32 UTC | unpack-trees: fix path search bug in verify_absent Commit 0cf73755 (unpack-trees.c: assume submodules are clean during check-out) changed an argument to verify_absent from 'path' to 'ce', which is however shadowed by a local variable of the same name. The bug triggers if verify_absent is used on a tree entry, for which the index contains one or more subsequent directories of the same length. The affected subdirectories are removed from the index. The testcase included in this commit bisects to 55218834 (checkout: do not lose staged removal), which reveals the bug in this case, but is otherwise unrelated. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:46:35 UTC |
| 6b9315d | Clemens Buchacher | 01 January 2009, 20:54:31 UTC | unpack-trees: handle failure in verify_absent Commit 203a2fe1 (Allow callers of unpack_trees() to handle failure) changed the "die on error" behavior to "return failure code". verify_absent did not handle errors returned by verify_clean_subdirectory, however. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:45:38 UTC |
| 0ddd93b | Henrik Austad | 05 January 2009, 15:25:37 UTC | Be consistent in switch usage for tar tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:23 UTC |
| c7719fb | Henrik Austad | 05 January 2009, 15:25:36 UTC | Use capitalized names where appropriate The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:02 UTC |
| 2ce53f9 | Johannes Schindelin | 02 January 2009, 18:08:40 UTC | git add: do not add files from a submodule It comes quite as a surprise to an unsuspecting Git user that calling "git add submodule/file" (which is a mistake, alright) _removes_ the submodule in the index, and adds the file. Instead, complain loudly. While at it, be nice when the user said "git add submodule/" which is most likely the consequence of tab-completion, and stage the submodule, instead of trying to add the contents of that directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 18:48:32 UTC |
| 22b3ddd | Johannes Schindelin | 02 January 2009, 18:08:00 UTC | bisect view: call gitk if Cygwin's SESSIONNAME variable is set It seems that Cygwin sets the variable SESSIONNAME when an interactive desktop session is running, and does not set it when you log in via ssh. So we can use this variable to determine whether to run gitk or git log in git bisect view. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2009, 22:25:27 UTC |
| dcfdbdf | Miklos Vajna | 03 January 2009, 03:59:12 UTC | fast-export: print usage when no options specified Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2009, 22:24:15 UTC |
| 3442ea4 | Junio C Hamano | 03 January 2009, 12:07:32 UTC | git checkout: do not allow switching to a tree-ish that is not a commit "git checkout -b newbranch $commit^{tree}" mistakenly created a new branch rooted at the current HEAD, because in that case, the two structure fields used to see if the command was invoked without any argument (hence it needs to default to checking out the HEAD) were populated incorrectly. Upon seeing a command line argument that we took as a rev, we should store that string in new.name, even if that does not name a commit. This will correctly trigger the existing safety logic. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Daniel Barkalow <barkalow@iabervon.org> | 03 January 2009, 21:34:19 UTC |
| 1f7903a | Junio C Hamano | 02 January 2009, 10:55:37 UTC | builtin-apply: prevent non-explicit permission changes A git patch that does not change the executable bit records the mode bits on its "index" line. "git apply" used to interpret this mode exactly the same way as it interprets the mode recorded on "new mode" line, as the wish by the patch submitter to set the mode to the one recorded on the line. The reason the mode does not agree between the submitter and the receiver in the first place is because there is _another_ commit that only appears on one side but not the other since their histories diverged, and that commit changes the mode. The patch has "index" line but not "new mode" line because its change is about updating the contents without affecting the mode. The application of such a patch is an explicit wish by the submitter to only cherry-pick the commit that updates the contents without cherry-picking the commit that modifies the mode. Viewed this way, the current behaviour is problematic, even though the command does warn when the mode of the path being patched does not match this mode, and a careful user could detect this inconsistencies between the patch submitter and the patch receiver. This changes the semantics of the mode recorded on the "index" line; instead of interpreting it as the submitter's wish to set the mode to the recorded value, it merely informs what the mode submitter happened to have, and the presense of the "index" line is taken as submitter's wish to keep whatever the mode is on the receiving end. This is based on the patch originally done by Alexander Potashev with a minor fix; the tests are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2009, 21:24:12 UTC |
| 11b8a41 | Philippe Bruhat (BooK) | 29 December 2008, 00:25:00 UTC | Git.pm: correctly handle directory name that evaluates to "false" The repository constructor mistakenly rewrote a Directory parameter that Perl happens to evaluate to false (e.g. "0") to ".". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 14:34:58 UTC |
| d99bf51 | jidanni@jidanni.org | 27 December 2008, 19:49:03 UTC | Documentation/git-tag.txt: minor typo and grammar fix Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 13:33:35 UTC |
| 936b705 | Junio C Hamano | 29 December 2008, 09:17:34 UTC | Prepare for v1.6.1.1 maintenance release Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:17:34 UTC |
| a9e67c8 | jidanni@jidanni.org | 29 December 2008, 07:03:17 UTC | Documentation/diff-options.txt: unify options Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:08:02 UTC |
| bd7c6e7 | Markus Heidelberg | 28 December 2008, 23:37:25 UTC | doc/git-send-email: mention sendemail.cc config variable This variable was added in 5f8b9fc (git-send-email: add a new sendemail.cc configuration variable, 2008-04-27), but is not yet refered to by the documentation. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:06:11 UTC |
| fb3bb3d | Devin Doucette | 27 December 2008, 09:39:31 UTC | gitweb: Fix export check in git_get_projects_list When $filter was empty, the path passed to check_export_ok would contain an extra '/', which some implementations of export_auth_hook are sensitive to. It makes more sense to fix this here than to handle the special case in each implementation of export_auth_hook. Signed-off-by: Devin Doucette <devin@doucette.cc> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2008, 06:34:03 UTC |
| a9012e3 | Junio C Hamano | 27 December 2008, 22:22:37 UTC | Merge branch 'rs/maint-tformat-foldline' into maint * rs/maint-tformat-foldline: pretty: support multiline subjects with format: pretty: factor out format_subject() pretty: factor out skip_empty_lines() | 27 December 2008, 22:22:37 UTC |
| f611c8c | Junio C Hamano | 27 December 2008, 22:21:24 UTC | Merge branch 'rs/maint-retval-fix' into maint * rs/maint-retval-fix: merge-file: handle freopen() failure daemon: cleanup: factor out xstrdup_tolower() daemon: cleanup: replace loop with if daemon: handle freopen() failure | 27 December 2008, 22:21:24 UTC |
| fcd3549 | Junio C Hamano | 27 December 2008, 22:21:15 UTC | Merge branch 'sp/maint-describe-all-tag-warning' into maint * sp/maint-describe-all-tag-warning: describe: Avoid unnecessary warning when using --all | 27 December 2008, 22:21:15 UTC |
| f83b9ba | Adeodato Simó | 27 December 2008, 08:50:30 UTC | git-send-email.txt: move --format-patch paragraph to a proper location When introducing --format-patch, its documentation was accidentally inserted in the middle of documentation for --validate. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 21:54:00 UTC |
| 3a882d9 | Adeodato Simó | 27 December 2008, 18:23:30 UTC | git-shortlog.txt: improve documentation about .mailmap files The description on .mailmap made it seem like they are only useful for commits with a wrong address for an author, but they are about fixing the real name. Explain this better in the text, and replace the existing example with a new one that hopefully makes things clearer. Signed-off-by: Adeodato Simó <dato@net.com.org.es> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 21:52:19 UTC |
| f53bd74 | René Scharfe | 27 December 2008, 00:49:21 UTC | pretty: support multiline subjects with format: git log --pretty=format:%s (and tformat:) used to display the first line of the subject, unlike the other --pretty options, which would construct a subject line from all lines of the first paragraph of the commit message. For consistency and increased code reuse, change format: to do the same as the other options. Before: $ git log --pretty=oneline v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - $ git log --pretty=tformat:"%H %s" v1.6.1 | md5sum 298903b1c065002e15daa5329213c51f - After: $ git log --pretty=tformat:"%H %s" v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - $ git log --pretty=oneline v1.6.1 | md5sum 7c0896d2a94fc3315a0372b9b3373a8f - Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:49 UTC |
| 88c4473 | René Scharfe | 27 December 2008, 00:39:35 UTC | pretty: factor out format_subject() The next patch will use it. In the version that was factored out, we can't rely on the len of the struct strbuf to find out if a line separator needs to be added, as it might already contain something. Add a guard variable ("first") instead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:40 UTC |
| a010966 | René Scharfe | 27 December 2008, 00:32:49 UTC | pretty: factor out skip_empty_lines() The patch after the next one will use it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 20:02:32 UTC |
| 4deba8b | René Scharfe | 26 December 2008, 10:17:04 UTC | merge-file: handle freopen() failure Report the error if redirection of stderr to /dev/null failed. This silences a compiler warning about ignoring the return value of freopen() on Ubuntu 8.10. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:10:02 UTC |
| 6720e95 | René Scharfe | 26 December 2008, 10:12:15 UTC | daemon: cleanup: factor out xstrdup_tolower() Add xstrdup_tolower(), a helper to get a lower case copy of a string, and use it in two cases. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:09:56 UTC |
| a583971 | René Scharfe | 26 December 2008, 10:01:57 UTC | daemon: cleanup: replace loop with if Replace a loop around an enter_repo() call, which was used to retry a single time with a different parameter in case the first call fails, with two calls and an if. This is shorter and cleaner. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:08:32 UTC |
| c569b1f | René Scharfe | 26 December 2008, 09:46:25 UTC | daemon: handle freopen() failure Die if stderr couldn't be sent to /dev/null when operating in inetd mode and report the error message from the OS. This fixes a compiler warning about the return value of freopen() being ignored on Ubuntu 8.10. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 03:07:56 UTC |
| 81dc223 | Shawn O. Pearce | 26 December 2008, 22:02:01 UTC | describe: Avoid unnecessary warning when using --all In 212945d4 ("Teach git-describe to verify annotated tag names before output") git-describe learned how to output a warning if an annotated tag object was matched but its internal name doesn't match the local ref name. However, "git describe --all" causes the local ref name to be prefixed with "tags/", so we need to skip over this prefix before comparing the local ref name with the name recorded inside of the tag object. Patch-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 00:37:53 UTC |
| 36e3b5e | Johannes Schindelin | 22 December 2008, 22:10:20 UTC | merge-recursive: mark rename/delete conflict as unmerged When a file was renamed in one branch, but deleted in the other, one should expect the index to contain an unmerged entry, namely the target of the rename. Make it so. Noticed by Constantine Plotnikov. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 December 2008, 07:06:48 UTC |
| e1f33ef | Kirill A. Korinskiy | 23 December 2008, 08:31:15 UTC | http-push: support full URI in handle_remote_ls_ctx() The program calls remote_ls() to get list of files from the server over HTTP; handle_remote_ls_ctx() is used to parse its response to populate "struct remote_ls_ctx" that is returned from remote_ls(). The handle_remote_ls_ctx() function assumed that the server returns a local path in href field, but RFC 4918 (14.7) demand of support full URI (e.g. "http://localhost:8080/repo.git"). This resulted in push failure (e.g. git-http-push issues a PROPFIND request to "/repo.git/alhost:8080/repo.git/refs/" to the server). Signed-off-by: Kirill A. Korinskiy <catap@catap.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 December 2008, 06:57:12 UTC |
| 8104ebf | Junio C Hamano | 25 December 2008, 03:41:08 UTC | GIT 1.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 December 2008, 03:41:08 UTC |
| 768c728 | Junio C Hamano | 24 December 2008, 08:14:14 UTC | Merge branch 'js/rebase-i-p' * js/rebase-i-p: rebase -i -p: leave a --cc patch when a merge could not be redone rebase -i -p: Fix --continue after a merge could not be redone Show a failure of rebase -p if the merge had a conflict | 24 December 2008, 08:14:14 UTC |
| 4fb1a19 | Johannes Schindelin | 22 December 2008, 21:16:51 UTC | rebase -i -p: leave a --cc patch when a merge could not be redone The result is easier to review this way, and the merge resolution has to be done inside the work tree, not by adjusting "the patch" anyway. | 24 December 2008, 08:14:08 UTC |
| c66c0cb | Miklos Vajna | 23 December 2008, 01:09:24 UTC | t9129: skip the last three tests if UTF-8 locale is not available Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2008, 02:11:33 UTC |
| 779e3a8 | Junio C Hamano | 22 December 2008, 03:20:21 UTC | GIT 1.6.1-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 03:20:21 UTC |
| f66bc5f | Richard Hartmann | 21 December 2008, 23:17:32 UTC | Always show which directory is not a git repository Unify all fatal: Not a git repository error messages so they include path information. Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:46:41 UTC |
| 5fdb709 | Richard Hartmann | 21 December 2008, 22:28:25 UTC | Make help entries alphabetical Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:45:05 UTC |
| 71cbf77 | Junio C Hamano | 22 December 2008, 02:35:54 UTC | Merge branch 'maint' * maint: doc/git-fsck: change the way for getting heads' SHA1s | 22 December 2008, 02:35:54 UTC |
| b80b5d6 | Boyd Stephen Smith Jr | 22 December 2008, 00:26:03 UTC | git-revert documentation: refer to new HOWTO on reverting faulty merges Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:34:49 UTC |
| d5be89d | Robin Rosenberg | 21 December 2008, 22:17:12 UTC | git-revert: record the parent against which a revert was made As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:32:04 UTC |
| 834caf9 | Junio C Hamano | 22 December 2008, 02:31:12 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Force the focus to the main window on Windows gitk: Allow unbalanced quotes/braces in commit headers gitk: Update German translation gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Ensure that "Reset branch" menu entry is enabled gitk: Use check-buttons' -text property instead of separate labels gitk: Map / to focus the search box gitk: Fix bugs in blaming code | 22 December 2008, 02:31:12 UTC |
