- 09 2月, 2009 1 次提交
-
-
由 Marius Storm-Olsen 提交于
This allows us to augment the repo mailmap file, and to use mailmap files elsewhere than the repository root. Meaning that the entries in mailmap.file will override the entries in "./.mailmap", should they match. Signed-off-by: NMarius Storm-Olsen <marius@trolltech.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 2月, 2009 13 次提交
-
-
由 Junio C Hamano 提交于
* 'jc/fsck' (early part): fsck: check loose objects from alternate object stores by default fsck: HEAD is part of refs
-
由 Nanako Shiraishi 提交于
This rewrites the example part of the bundle doucmentation to follow the suggestion made by Junio during a recent discussion (gmane 108030). Instead of just showing different ways to create and use bundles in a disconnected fashion, the rewritten example first shows the simplest "full cycle" of sneakernet workflow, and then introduces various variations. The words are mostly taken from Junio's outline. I only reformatted them and proofread to make sure the end result flows naturally. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Alexander Potashev 提交于
Signed-off-by: NAlexander Potashev <aspotashev@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 jidanni@jidanni.org 提交于
Signed-off-by: Njidanni <jidanni@jidanni.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
Add a tool 'git-resurrect.sh <branch>' that tries to find traces of the <branch> in the HEAD reflog and, optionally, all merge commits in the repository. It can then resurrect the branch, pointing it at the most recent of all candidate commits found. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: urls.txt: document optional port specification in git URLS builtin-mv.c: check for unversionned files before looking at the destination. Add a testcase for "git mv -f" on untracked files. Missing && in t/t7001.sh.
-
由 Junio C Hamano 提交于
* wp/add-patch-find: add -p: trap Ctrl-D in 'goto' mode add -p: change prompt separator for 'g' In add --patch, Handle K,k,J,j slightly more gracefully. Add / command in add --patch git-add -i/-p: Change prompt separater from slash to comma
-
由 Junio C Hamano 提交于
* ns/am-slacker: git-am: Add --ignore-date option am: Add --committer-date-is-author-date option Conflicts: git-am.sh
-
由 Stefan Naewe 提交于
Signed-off-by: NStefan Naewe <stefan.naewe+git@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint-1.6.0: builtin-mv.c: check for unversionned files before looking at the destination. Add a testcase for "git mv -f" on untracked files. Missing && in t/t7001.sh.
-
由 Matthieu Moy 提交于
The previous code was failing in the case where one moves an unversionned file to an existing destination, with mv -f: the "existing destination" was checked first, and the error was cancelled by the force flag. We now check the unrecoverable error first, which fixes the bug. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthieu Moy 提交于
This currently fails with: git: builtin-mv.c:217: cmd_mv: Assertion `pos >= 0' failed. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthieu Moy 提交于
Without this, the exit status is only the one of the last line. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 2月, 2009 11 次提交
-
-
由 Thomas Rast 提交于
If the user hit Ctrl-D (EOF) while the script was in 'go to hunk?' mode, it threw an undefined variable error. Explicitly test for EOF and have it re-enter the goto prompt loop. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
57886bc7 (git-add -i/-p: Change prompt separater from slash to comma, 2008-11-27) changed the prompt separator to ',', but forgot to adapt the 'g' (goto) command. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind Conflicts: Makefile
-
由 Junio C Hamano 提交于
* maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind
-
由 William Pursell 提交于
These days you must explicitly say "git stash save <comment>". Signed-off-by: NWilliam Pursell <bill.pursell@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Guanqun Lu 提交于
5c5ba73b (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: NGuanqun Lu <guanqun.lu@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Guanqun Lu 提交于
Signed-off-by: NGuanqun Lu <guanqun.lu@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
Add a bit of code to __git_ps1 that lets it append '*' to the branch name if there are any unstaged changes, and '+' if there are any staged changes. Since this is a rather expensive operation and will force a lot of data into the cache whenever you first enter a repository, you have to enable it manually by setting GIT_PS1_SHOWDIRTYSTATE to a nonempty value. The configuration variable bash.showDirtyState can then be used to disable it again for some repositories. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841c(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Brian Gernhardt noticed that t3411 was broken recently on case insensitive filesystems. 00884968 (test-lib.sh: introduce test_commit() and test_merge() helpers, 2009-01-27) used a tag and a file with the same name, only different in case, and converted many existing tests that needed only a file (or a tag). Some tests may want to refer to a rev or a file, but on a filesystem that loses cases, referring to either without disambiguation mark ("--") on the command line now triggers an error (t3411 was the only one such test). Fix it by using a filename that is different from the tagname each step creates. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
21828964 (t3412: clean up GIT_EDITOR usage, 2009-01-30) tried to clean up the script's use of GIT_EDITOR, but it can further be simplified, because that is how test-lib.sh sets things up already. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 2月, 2009 5 次提交
-
-
由 Junio C Hamano 提交于
* maint: grep: pass -I (ignore binary) down to external grep
-
由 Junio C Hamano 提交于
* maint-1.6.0: grep: pass -I (ignore binary) down to external grep
-
由 Junio C Hamano 提交于
* jc/maint-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted
-
由 Junio C Hamano 提交于
* jk/maint-cleanup-after-exec-failure: git: use run_command() to execute dashed externals run_command(): help callers distinguish errors run_command(): handle missing command errors more gracefully git: s/run_command/run_builtin/
-
由 Junio C Hamano 提交于
We forgot to pass this option to the external grep process. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 2月, 2009 6 次提交
-
-
由 William Pursell 提交于
Instead of printing the help menu, this will print "No next hunk" and then process the given hunk again. Signed-off-by: NWilliam Pursell <bill.pursell@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 William Pursell 提交于
This command allows the user to skip hunks that don't match the specified regex. Signed-off-by: NWilliam Pursell <bill.pursell@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 William Pursell 提交于
Otherwise the find command '/' soon to be introduced will be hard to see. Signed-off-by: NWilliam Pursell <bill.pursell@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
Replace all 'git log --graph' calls for history verification with the combination of 'git log ...| git name-rev' first introduced by a6c7a276 (rebase -i: correctly remember --root flag across --continue, 2009-01-26). This should be less susceptible to format changes than the --graph code. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jakub Narebski 提交于
One had to configure gitweb for it to find static files (stylesheets, images) when using path_info URLs. Now that it is not necessary thanks to adding BASE element to HTML head if needed, update README to reflect this fact. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Kirill Smelkov 提交于
currently for cases like From: A U Thor <a.u.thor@example.com> (Comment) mailinfo extracts the following 'Author:' field: Author: A U Thor (Comment) ^^ which has two extra spaces left in there after removed email part. I think this is wrong so here is a fix. Signed-off-by: NKirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 2月, 2009 4 次提交
-
-
由 Junio C Hamano 提交于
* ks/maint-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header
-
由 Junio C Hamano 提交于
* jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
-
由 Junio C Hamano 提交于
* am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description
-
由 Junio C Hamano 提交于
* jc/maint-allow-uninteresting-missing: revision traversal: allow UNINTERESTING objects to be missing
-