| 9bd81e4 | Junio C Hamano | 25 May 2008, 21:25:02 UTC | Merge branch 'js/config-cb' * js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c | 25 May 2008, 21:25:02 UTC |
| 450c5ae | Junio C Hamano | 25 May 2008, 21:05:11 UTC | Merge branch 'as/graph' * as/graph: get_revision(): honor the topo_order flag for boundary commits Fix output of "git log --graph --boundary" log --graph --left-right: show left/right information in place of '*' graph API: don't print branch lines for uninteresting merge parents graph API: fix graph mis-alignment after uninteresting commits | 25 May 2008, 21:05:11 UTC |
| cc26efb | Junio C Hamano | 25 May 2008, 21:05:09 UTC | Merge branch 'js/mailinfo' * js/mailinfo: mailsplit: minor clean-up in read_line_with_nul() mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths mailsplit and mailinfo: gracefully handle NUL characters | 25 May 2008, 21:05:09 UTC |
| 0166592 | Junio C Hamano | 25 May 2008, 21:03:50 UTC | Merge branch 'jc/add-n-u' * jc/add-n-u: Make git add -n and git -u -n output consistent "git-add -n -u" should not add but just report Conflicts: builtin-add.c builtin-mv.c cache.h read-cache.c | 25 May 2008, 21:03:50 UTC |
| 488ee2f | Junio C Hamano | 25 May 2008, 20:49:16 UTC | Merge branch 'ar/t6031' * ar/t6031: Fix t6031 on filesystems without working exec bit | 25 May 2008, 20:49:16 UTC |
| b84c343 | Junio C Hamano | 25 May 2008, 20:38:44 UTC | Merge branch 'db/clone-in-c' * db/clone-in-c: Add test for cloning with "--reference" repo being a subset of source repo Add a test for another combination of --reference Test that --reference actually suppresses fetching referenced objects clone: fall back to copying if hardlinking fails builtin-clone.c: Need to closedir() in copy_or_link_directory() builtin-clone: fix initial checkout Build in clone Provide API access to init_db() Add a function to set a non-default work tree Allow for having for_each_ref() list extra refs Have a constant extern refspec for "--tags" Add a library function to add an alternate to the alternates file Add a lockfile function to append to a file Mark the list of refs to fetch as const Conflicts: cache.h t/t5700-clone-reference.sh | 25 May 2008, 20:41:37 UTC |
| 0dbaa5b | Junio C Hamano | 25 May 2008, 20:38:31 UTC | Merge branch 'jc/apply-whitespace' * jc/apply-whitespace: builtin-apply: do not declare patch is creation when we do not know it builtin-apply: accept patch to an empty file builtin-apply: typofix | 25 May 2008, 20:38:31 UTC |
| a24d287 | Junio C Hamano | 25 May 2008, 20:38:27 UTC | Merge branch 'jc/unpack-trees-reword' * jc/unpack-trees-reword: unpack-trees: allow Porcelain to give different error messages | 25 May 2008, 20:38:27 UTC |
| 2931344 | Junio C Hamano | 25 May 2008, 20:38:06 UTC | Merge branch 'ar/batch-cat' * ar/batch-cat: change quoting in test t1006-cat-file.sh builtin-cat-file.c: use parse_options() git-svn: Speed up fetch Git.pm: Add hash_and_insert_object and cat_blob Git.pm: Add command_bidi_pipe and command_close_bidi_pipe git-hash-object: Add --stdin-paths option Add more tests for git hash-object Move git-hash-object tests from t5303 to t1007 git-cat-file: Add --batch option git-cat-file: Add --batch-check option git-cat-file: Make option parsing a little more flexible git-cat-file: Small refactor of cmd_cat_file Add tests for git cat-file | 25 May 2008, 20:38:06 UTC |
| 325566c | Junio C Hamano | 25 May 2008, 20:38:03 UTC | Merge branch 'cc/bisect' * cc/bisect: bisect: use a detached HEAD to bisect bisect: trap critical errors in "bisect_start" bisect: fix left over "BISECT_START" file when starting with junk rev bisect: add test cases to check that "git bisect start" is atomic | 25 May 2008, 20:38:03 UTC |
| 834836b | Junio C Hamano | 25 May 2008, 20:37:25 UTC | Merge branch 'ap/svn' * ap/svn: git-svn: add test for --add-author-from and --use-log-author git-svn: add documentation for --add-author-from option. git-svn: Add --add-author-from option. git-svn: add documentation for --use-log-author option. | 25 May 2008, 20:37:25 UTC |
| 6c99f18 | Junio C Hamano | 25 May 2008, 20:37:20 UTC | Merge branch 'js/cvsexportcommit' * js/cvsexportcommit: cvsexportcommit: introduce -W for shared working trees (between Git and CVS) cvsexportcommit: chomp only removes trailing whitespace Conflicts: git-cvsexportcommit.perl | 25 May 2008, 20:37:20 UTC |
| 7e83003 | Junio C Hamano | 25 May 2008, 20:37:08 UTC | Merge branch 'js/ignore-submodule' * js/ignore-submodule: Ignore dirty submodule states during rebase and stash Teach update-index about --ignore-submodules diff options: Introduce --ignore-submodules | 25 May 2008, 20:37:08 UTC |
| 58dd491 | Junio C Hamano | 25 May 2008, 20:37:04 UTC | Merge branch 'mo/cvsserver' * mo/cvsserver: Documentation: Fix skipped section level git-cvsserver: add ability to guess -kb from contents implement gitcvs.usecrlfattr git-cvsserver: add mechanism for managing working tree and current directory | 25 May 2008, 20:37:04 UTC |
| edc5594 | Junio C Hamano | 25 May 2008, 08:23:55 UTC | mailsplit: minor clean-up in read_line_with_nul() Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:23:57 UTC |
| 9aa2309 | Junio C Hamano | 25 May 2008, 08:16:05 UTC | mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:22:18 UTC |
| cce8d6f | Johannes Schindelin | 16 May 2008, 13:03:30 UTC | mailsplit and mailinfo: gracefully handle NUL characters The function fgets() has a big problem with NUL characters: it reads them, but nobody will know if the NUL comes from the file stream, or was appended at the end of the line. So implement a custom read_line_with_nul() function. Noticed by Tommy Thorn. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:21:40 UTC |
| 6a491a1 | Clemens Buchacher | 25 May 2008, 18:27:44 UTC | http-push: remove remote locks on exit signals If locks are not cleaned up the repository is inaccessible for 10 minutes. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:07:24 UTC |
| a129293 | Clemens Buchacher | 25 May 2008, 18:26:50 UTC | Reset the signal being handled This did not cause any problems, because remove_lock_file_on_signal is only registered for SIGINT. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:06:55 UTC |
| 509792b | Paul Oliver | 23 May 2008, 18:29:22 UTC | Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them. Signed-off-by: Paul Oliver <puzza007@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:06:49 UTC |
| 4603ec0 | Adam Simpkins | 24 May 2008, 23:02:05 UTC | get_revision(): honor the topo_order flag for boundary commits Now get_revision() sorts the boundary commits when topo_order is set. Since sort_in_topological_order() takes a struct commit_list, it first places the boundary commits into revs->commits. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:22:24 UTC |
| 3c68d67 | Adam Simpkins | 24 May 2008, 23:02:04 UTC | Fix output of "git log --graph --boundary" Previously the graphing API wasn't aware of the revs->boundary flag, and it always assumed that commits marked UNINTERESTING would not be displayed. As a result, the boundary commits were printed at the end of the log output, but they didn't have any branch lines connecting them to their children in the graph. There was also another bug in the get_revision() code that caused graph_update() to be called twice on the first boundary commit. This caused the graph API to think that a commit had been skipped, and print a "..." line in the output. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:16:56 UTC |
| 7528f27 | Adam Simpkins | 25 May 2008, 07:07:21 UTC | log --graph --left-right: show left/right information in place of '*' With the --graph option, the graph already outputs 'o' instead of '*' for boundary commits. Make it emit '<' or '>' when --left-right is specified. (This change also disables the '^' prefix for UNINTERESTING commits. The graph code currently doesn't print anything special for these commits, since it assumes no UNINTERESTING, non-BOUNDARY commits are displayed. This is potentially a bug if UNINTERESTING non-BOUNDARY commits can actually be displayed via some code path.) [jc: squashed the left-right change from Dscho and Adam's fixup into one] Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:06:52 UTC |
| 37a75ab | Adam Simpkins | 24 May 2008, 02:24:11 UTC | graph API: don't print branch lines for uninteresting merge parents Previously, the graphing code printed lines coming out of a merge commit for all of its parents, even if some of them were uninteresting. Now it only prints lines for interesting commits. For example, for a merge commit where only the first parent is interesting, the code now prints: * merge commit * interesting child instead of: M merge commit |\ * interesting child Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 18:43:22 UTC |
| 2ecbd0a | Adam Simpkins | 24 May 2008, 02:24:10 UTC | graph API: fix graph mis-alignment after uninteresting commits The graphing code had a bug that caused it to output branch lines incorrectly after ignoring an uninteresting commit. When computing how to match up the branch lines from the current commit to the next one, it forgot to take into account that it needed to initially start with 2 empty spaces where the missing commit would have gone. So, instead of drawing this, | * | <- Commit with uninteresting parent | / * | It used to incorrectly draw this: | * | <- Commit with uninteresting parent * | Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 18:42:44 UTC |
| b27a23e | Christian Couder | 24 May 2008, 18:56:44 UTC | Documentation: convert tutorials to man pages This patch renames the following documents and at the same time converts them to the man page format: cvs-migration.txt -> gitcvs-migration.txt tutorial.txt -> gittutorial.txt tutorial-2.txt -> gittutorial-2.txt These new man pages are put in section 7, and other documents that reference the above ones are change accordingly. [jc: with help from Nanako to clean things up] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:28:16 UTC |
| 0b0b8cd | Miklos Vajna | 22 May 2008, 23:26:09 UTC | CodingGuidelines: Add a note to avoid assignments inside if() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:13:19 UTC |
| 633f43e | Heikki Orsila | 23 May 2008, 22:43:55 UTC | Remove redundant code, eliminate one static variable Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:05:06 UTC |
| 998b912 | Junio C Hamano | 24 May 2008, 01:28:52 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" gitk: Fix bug where current row number display stops working gitk: Move es.po where it belongs gitk: Fix "wrong # coordinates" error on reload | 24 May 2008, 01:28:52 UTC |
| 182fb4d | Junio C Hamano | 23 May 2008, 23:06:07 UTC | Merge branch 'pb/push' * pb/push: add special "matching refs" refspec | 23 May 2008, 23:06:07 UTC |
| e5e9714 | Junio C Hamano | 23 May 2008, 23:06:01 UTC | Merge branch 'bc/repack' * bc/repack: Documentation/git-repack.txt: document new -A behaviour let pack-objects do the writing of unreachable objects as loose objects add a force_object_loose() function builtin-gc.c: deprecate --prune, it now really has no effect git-gc: always use -A when manually repacking repack: modify behavior of -A option to leave unreferenced objects unpacked Conflicts: builtin-pack-objects.c | 23 May 2008, 23:06:01 UTC |
| 6aad47d | Junio C Hamano | 23 May 2008, 23:05:52 UTC | Merge branch 'sp/ignorecase' * sp/ignorecase: t0050: Fix merge test on case sensitive file systems t0050: Add test for case insensitive add t0050: Set core.ignorecase case to activate case insensitivity t0050: Test autodetect core.ignorecase git-init: autodetect core.ignorecase | 23 May 2008, 23:05:52 UTC |
| e13067a | Junio C Hamano | 23 May 2008, 23:05:46 UTC | Merge branch 'maint' * maint: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref Add missing "short" alternative to --date in rev-list-options.txt git-show.txt: Not very stubby these days. Clarify repack -n documentation | 23 May 2008, 23:05:46 UTC |
| dd0ffd5 | Heikki Orsila | 22 May 2008, 15:24:07 UTC | Add log.date config variable log.date config variable sets the default date-time mode for the log command. Setting log.date value is similar to using git log's --date option. Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 23:05:42 UTC |
| 77599cc | Junio C Hamano | 23 May 2008, 22:52:43 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref | 23 May 2008, 22:52:43 UTC |
| e00f379 | Johannes Sixt | 23 May 2008, 14:13:05 UTC | rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref The intention of --symbolic-full-name is to not print anything if a revision is not an exact ref. But this command: $ git-rev-parse --symbolic-full-name --not master~1 still emitted a sole '^' to stdout (provided that there's no other ref at master~1). This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 22:52:20 UTC |
| 205ffa9 | Gustaf Hendeby | 22 May 2008, 21:59:42 UTC | Make git add -n and git -u -n output consistent Output format from "git add -n $path" lists path to blobs that are going to be added on a single line, separated with SP. On the other hand, the suggested "git add -u -n" shows one path per line, like "add '<file>'\n". Of course, these two are inconsistent. Plain "git add -n" can afford to only say names of paths, as all it does is to add (update). However, "git add -u" needs to be able to express "remove" somehow. So if we need to have them formatted the same way, we need to unify with the "git add -n -u" format. Incidentally, this is consistent with how 'update-index' says it. This changes the output from "git add -n $paths" but as a general principle, output from Porcelain commands is a fair game for improvements and not for script consumption. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 21:47:02 UTC |
| 6c41e21 | Michele Ballabio | 23 May 2008, 14:19:43 UTC | change quoting in test t1006-cat-file.sh Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:08:42 UTC |
| 15d8e56 | Michele Ballabio | 23 May 2008, 14:19:42 UTC | builtin-cat-file.c: use parse_options() This simplifies the option parsing. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:08:38 UTC |
| ffe256f | Adam Roben | 23 May 2008, 14:19:41 UTC | git-svn: Speed up fetch We were spending a lot of time forking/execing git-cat-file and git-hash-object. We now maintain a global Git repository object in order to use Git.pm's more efficient hash_and_insert_object and cat_blob methods. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:07:05 UTC |
| 7182530 | Adam Roben | 23 May 2008, 14:19:40 UTC | Git.pm: Add hash_and_insert_object and cat_blob These functions are more efficient ways of executing `git hash-object -w` and `git cat-file blob` when you are dealing with many files/objects. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:06:58 UTC |
| d1a29af | Adam Roben | 23 May 2008, 14:19:39 UTC | Git.pm: Add command_bidi_pipe and command_close_bidi_pipe command_bidi_pipe hands back the stdin and stdout file handles from the executed command. command_close_bidi_pipe closes these handles and terminates the process. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:06:51 UTC |
| d8ee483 | Adam Roben | 23 May 2008, 14:19:38 UTC | git-hash-object: Add --stdin-paths option This allows multiple paths to be specified on stdin. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:06:35 UTC |
| 3ea5a1b | Adam Roben | 23 May 2008, 14:19:37 UTC | Add more tests for git hash-object Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:06:29 UTC |
| 97e435a | Adam Roben | 23 May 2008, 14:19:36 UTC | Move git-hash-object tests from t5303 to t1007 This is a more appropriate location according to t/README. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 19:06:20 UTC |
| 950ce2e | Chris Parsons | 22 May 2008, 12:50:02 UTC | Updated status to show 'Not currently on any branch' in red This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:51:22 UTC |
| b50c846 | Johan Herland | 22 May 2008, 22:03:00 UTC | Add test for cloning with "--reference" repo being a subset of source repo The first test in this series tests "git clone -l -s --reference B A C", where repo B is a superset of repo A (A has one commit, B has the same commit plus another). In this case, all objects to be cloned are already present in B. However, we should also test the case where the "--reference" repo is a _subset_ of the source repo (e.g. "git clone -l -s --reference A B C"), i.e. some objects are not available in the "--reference" repo, and will have to be found in the source repo. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:35:23 UTC |
| fabb019 | Johan Herland | 22 May 2008, 22:03:05 UTC | Add a test for another combination of --reference In this case, the reference repository has some useful loose objects, but not all useful objects, and we make sure that we can find the objects we fetch from the repository we're cloning in the new repository, instead of potentially being distracted by the reference repository. Doing the wrong thing in a builtin-clone implementation would lead to this looking for an object in the wrong place, not finding it (because it's only in the right place), and crashing. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:35:09 UTC |
| 4ba776c | Daniel Barkalow | 22 May 2008, 22:03:08 UTC | Test that --reference actually suppresses fetching referenced objects Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:33:50 UTC |
| 26b4d00 | Heikki Orsila | 22 May 2008, 15:24:41 UTC | Add missing "short" alternative to --date in rev-list-options.txt Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:29:46 UTC |
| 3a3e097 | Jon Loeliger | 22 May 2008, 19:59:25 UTC | git-show.txt: Not very stubby these days. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:30 UTC |
| c30f993 | Shawn O. Pearce | 22 May 2008, 12:47:19 UTC | Clarify repack -n documentation While repacking a local repository a coworker thought the -n option was necessary to git-repack to keep it from updating some unknown file on the central server we all share. Explaining further what the option is (not) doing helps to make it clear the option does not impact any remote repositories the user may have configured. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:21:29 UTC |
| f9189cf | Johannes Schindelin | 21 May 2008, 11:32:16 UTC | pull --rebase: exit early when the working directory is dirty When rebasing fails during "pull --rebase", you cannot just clean up the working directory and call "pull --rebase" again, since the remote branch was already fetched. Therefore, die early when the working directory is dirty. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:05:11 UTC |
| dee2775 | Anders Waldenborg | 21 May 2008, 11:44:43 UTC | gitweb: Convert string to internal form before chopping in chop_str Fix chop_str not to cut in middle of utf8 multibyte chars. Without this fix at least author name in short log may cut in middle of a multibyte char. When the result comes to esc_html to_utf8 is called again, which doesn't find valid utf8 and decodes using $fallback_encoding making it even worse. This also have the nice side effect that it actually tries to show the first 10 _characters_, not the number of characters that happened to fit into 10 bytes. Signed-off-by: Anders Waldenborg <anders@0x63.nu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 06:03:43 UTC |
| 634f246 | Christian Couder | 22 May 2008, 23:28:57 UTC | bisect: use a detached HEAD to bisect When "git bisect" was first written, it was not possible to checkout a detached HEAD. The detached feature appeared latter. That's why before this patch the "git bisect" process used a "bisect" branch to checkout new revisions to be tested (and also a "new-bisect" one to check if the checkouts could work). This patch makes "git bisect" checkout revisions to be tested on a detached HEAD. This simplifies the code a bit. The tests to check that "git bisect" does not start if a "bisect" or a "new-bisect" branch exists are removed as they are not relevant any more. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 05:45:03 UTC |
| ba963de | Christian Couder | 22 May 2008, 22:39:22 UTC | bisect: trap critical errors in "bisect_start" Before this patch, when using "git bisect start" with mistaken revs or when the checkout of the branch we want to test failed, we exited after having written files like ".git/BISECT_START", ".git/BISECT_NAMES" and after having written "refs/bisect/bad" and "refs/bisect/good-*" refs. With this patch we trap all errors that can happen when writing the new state and when we are in "bisect_next". So that we can try to clean up everything in case of problems, using "bisect_clean_state". This patch also contains a "bisect_write" cleanup to make it exit on error and return 0 otherwise. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 05:24:16 UTC |
| 9d0cd91 | Christian Couder | 22 May 2008, 22:38:59 UTC | bisect: fix left over "BISECT_START" file when starting with junk rev Before this patch, when using for example: $ git bisect start <stuff1> <stuff2> with <stuff1> or <stuff2> that cannot be parsed as a revision, we could leave a ".git/BISECT_START" file, from a previous "git bisect start", alone. This patch makes sure that it does not happen by removing the "BISECT_START" file in "bisect_clean_state" and then always writing it again at the end of "bisect_start". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 05:16:45 UTC |
| d3aca58 | Christian Couder | 22 May 2008, 22:38:46 UTC | bisect: add test cases to check that "git bisect start" is atomic This patch adds some test cases to check that "git bisect start" doesn't leave us in a bad state, especially when it fails. These test cases show that "git bisect start" is not atomic when it fails and leave some files like .git/BISECT_START, and in some cases some refs, over. The test failures should be fixed in latter commits. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 May 2008, 05:01:27 UTC |
| a977953 | Paul Mackerras | 22 May 2008, 11:12:19 UTC | gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" Commit 94503a66c56c935e77a8fbe3622f1f56b7134ccc ("gitk: Fix "wrong # coordinates" error on reload") was correct as far as it went, but introduced a problem because it didn't also clear out boldrows and boldnamerows in clear_display. This resulted in Tcl errors after scrolling through the graph for a while if some rows were highlighted. This fixes it. Signed-off-by: Paul Mackerras <paulus@samba.org> | 22 May 2008, 11:12:19 UTC |
| b592d88 | Gustaf Hendeby | 22 May 2008, 02:28:43 UTC | Documentation: Fix skipped section level With xmlto 0.0.18 it seems to demand that no section levels are skipped. The commit 'implement gitcvs.usecrlfattr' (8a06a632976ead) one such skip, which here is removed by increasing the level of the offender. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 May 2008, 03:57:02 UTC |
| 1af8bca | Junio C Hamano | 21 May 2008, 21:42:30 UTC | Merge branch 'maint' * maint: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/ | 21 May 2008, 21:42:30 UTC |
| 008442f | Junio C Hamano | 21 May 2008, 21:27:59 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/ | 21 May 2008, 21:27:59 UTC |
| 9d88058 | Junio C Hamano | 21 May 2008, 21:16:46 UTC | Merge branch 'ar/add-unreadable' * ar/add-unreadable: Add a config option to ignore errors for git-add Add a test for git-add --ignore-errors Add --ignore-errors to git-add to allow it to skip files with read errors Extend interface of add_files_to_cache to allow ignore indexing errors Make the exit code of add_file_to_index actually useful | 21 May 2008, 21:16:46 UTC |
| 8fe114a | Junio C Hamano | 21 May 2008, 21:16:33 UTC | Merge branch 'ds/branch-auto-rebase' * ds/branch-auto-rebase: Allow tracking branches to set up rebase by default. | 21 May 2008, 21:16:33 UTC |
| f0abea6 | Junio C Hamano | 21 May 2008, 21:15:52 UTC | Merge branch 'sv/first-parent' * sv/first-parent: revision.c: really honor --first-parent Simplify and fix --first-parent implementation | 21 May 2008, 21:15:52 UTC |
| 1fe82d6 | Junio C Hamano | 21 May 2008, 21:15:19 UTC | Merge branch 'np/pack' * np/pack: pack-objects: fix early eviction for max depth delta objects pack-objects: allow for early delta deflating pack-objects: move compression code in a separate function pack-objects: clean up write_object() a bit pack-objects: simplify the condition associated with --all-progress pack-objects: remove some double negative logic pack-objects: small cleanup | 21 May 2008, 21:15:19 UTC |
| c748152 | Junio C Hamano | 21 May 2008, 21:05:02 UTC | Merge branch 'as/graph' * as/graph: graph API: eliminate unnecessary indentation log and rev-list: add --graph option Add history graph API revision API: split parent rewriting and parent printing options | 21 May 2008, 21:05:02 UTC |
| c01cdde | Junio C Hamano | 21 May 2008, 20:57:50 UTC | Merge branch 'jk/maint-send-email-compose' * jk/maint-send-email-compose: send-email: rfc2047-quote subject lines with non-ascii characters send-email: specify content-type of --compose body Conflicts: t/t9001-send-email.sh Due to 065096c (git-send-email.perl: Handle shell metacharacters in $EDITOR properly, 2008-05-04) which is a backward incompatible change (but it makes handling of EDITOR consistent with other parts of the system), the test script t9001 had to be adjusted. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:57:50 UTC |
| 2c0577f | Junio C Hamano | 21 May 2008, 20:09:31 UTC | Merge branch 'hb/maint-send-email-quote-recipients' * hb/maint-send-email-quote-recipients: Fix recipient santitization | 21 May 2008, 20:09:31 UTC |
| 325abb7 | Trent Piepho | 08 May 2008, 21:26:55 UTC | cvsexportcommit: Create config option for CVS dir For a given project the directory used with the -w option is almost always the same each time. Let it be specified with 'cvsexportcommit.cvsdir' so it's not necessary to manually add it with -w each time. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Acked-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:07:41 UTC |
| 18023c2 | Horst H. von Brand | 28 March 2008, 14:09:04 UTC | Fix recipient santitization Need to quote all special characters, not just the first one Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:50 UTC |
| d54eaaa | Jeff King | 28 March 2008, 21:29:01 UTC | send-email: rfc2047-quote subject lines with non-ascii characters We always use 'utf-8' as the encoding, since we currently have no way of getting the information from the user. This also refactors the quoting of recipient names, since both processes can share the rfc2047 quoting code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:10 UTC |
| 0706bd1 | Jeff King | 28 March 2008, 21:28:33 UTC | send-email: specify content-type of --compose body If the compose message contains non-ascii characters, then we assume it is in utf-8 and include the appropriate MIME headers. If the user has already included a MIME-Version header, then we assume they know what they are doing and don't add any headers. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 20:05:09 UTC |
| 824b5dc | Christian Couder | 13 May 2008, 04:51:41 UTC | Documentation: rev-parse: add a few "--verify" and "--default" examples Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 19:57:18 UTC |
| c3170a8 | Miklos Vajna | 12 May 2008, 17:22:56 UTC | git-merge: exclude unnecessary options from OPTIONS_SPEC gitcli(5) already documents them, and there are no options named --no-no-stat, --no-no-summary and --no-no-log. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 19:54:49 UTC |
| 38ed1d8 | Junio C Hamano | 21 May 2008, 19:04:34 UTC | "git-add -n -u" should not add but just report Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 19:04:41 UTC |
| 26ec126 | Alex Riesen | 20 May 2008, 21:59:32 UTC | Fix t3701 if core.filemode disabled [jc: squashed in suggestions from Jeff King] Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 18:20:34 UTC |
| fdabc24 | Daniel Barkalow | 20 May 2008, 18:15:14 UTC | clone: fall back to copying if hardlinking fails Note that it stops trying hardlinks if any fail. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 18:11:58 UTC |
| 28f8802 | Alex Riesen | 18 May 2008, 14:57:27 UTC | Fix t6031 on filesystems without working exec bit The point of the test is not really to test the ability of the filesystem to keep the given x-bit, but to check is merge-recursive correctly handles it. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 17:14:51 UTC |
| 4be1fe1 | Marcel Koeppen | 21 May 2008, 16:25:54 UTC | Fix prepare-commit-msg hook and replace in-place sed The patterns to the case statement could never be matched, so the hook was a noop. This patch also replaces the non-portable use of in-place sed. Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 May 2008, 16:45:53 UTC |
| 94b4a69 | Paul Mackerras | 20 May 2008, 10:51:06 UTC | gitk: Fix bug where current row number display stops working The display of the current row number would stop working if the user clicked on a line, or if selectedline got unset for any other reason, because the trace on it got lost when it was unselected. This fixes it by changing the places that unset selectedline to set it to the empty string instead, and the places that tested for it being set or unset to compare it with the empty string. Thus it never gets unset now. This actually simplified the code in a few places since it can be compared for equality with a row number now without first testing if it is set. Signed-off-by: Paul Mackerras <paulus@samba.org> | 20 May 2008, 10:51:06 UTC |
| e77b0b5 | Jeff King | 19 May 2008, 20:09:06 UTC | git-am: fix typo in usage message Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:47:16 UTC |
| 74190d2 | Jeff King | 19 May 2008, 20:08:33 UTC | doc/git-daemon: s/uploadarchive/uploadarch/ The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:46:13 UTC |
| 6923972 | Gustaf Hendeby | 19 May 2008, 22:47:28 UTC | Documentation: Add missing git svn commands Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 05:42:29 UTC |
| 8ccba00 | Junio C Hamano | 17 May 2008, 19:03:49 UTC | unpack-trees: allow Porcelain to give different error messages The plumbing output is sacred as it is an API. We _could_ change it if it is broken in such a way that it cannot convey necessary information fully, but we just do not _reword_ for the sake of rewording. If somebody does not like it, s/he is complaining too late. S/he should have been here in early May 2005 and make the language used by the API closer to what humans read. S/he wasn't here. Too bad, and it is too late. And people who complain should look at a bigger picture. Look at what was suggested by one of them and think for five seconds: $ git checkout mytopic -fatal: Entry 'frotz' not uptodate. Cannot merge. +fatal: Entry 'frotz' has local changes. Cannot merge. If you do not see something wrong with this output, your brain has already been rotten with use of git for too long a time. Nobody asked us to "merge" but why are we talking about "Cannot merge"? This patch introduces a mechanism to allow Porcelains to specify messages that are different from the ones that is given by the underlying plumbing implementation of read-tree, so that we can reword the message Porcelains give without disrupting the output from the plumbing. $ git-checkout pu error: You have local changes to 'Makefile'; cannot switch branches. There are other places that ask unpack_trees() to n-way merge, detect issues and let it issue error message on its own, but I did this as a demonstration and replaced only one message. Yes I know about C99 structure initializers. I'd love to use them but we try to be nice to compilers without it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2008, 02:30:13 UTC |
| 9231e3a | Brandon Casey | 18 May 2008, 04:03:03 UTC | t/Makefile: "trash" directory was renamed recently Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2008, 04:39:58 UTC |
| 2a028a0 | Alex Riesen | 18 May 2008, 15:27:00 UTC | Ensure that a test is run in the trash directory Exit with error if cd into the "trash directory" failed (error already reported, so just exit). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2008, 04:39:22 UTC |
| 689ef4d | Brandon Casey | 18 May 2008, 04:00:01 UTC | builtin-clone.c: Need to closedir() in copy_or_link_directory() So not to leak file descriptors, close the directory after opening it. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2008, 04:38:29 UTC |
| 64dc208 | Michele Ballabio | 17 May 2008, 17:16:31 UTC | gitk: Move es.po where it belongs Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 18 May 2008, 23:49:15 UTC |
| 94503a6 | Paul Mackerras | 18 May 2008, 23:48:45 UTC | gitk: Fix "wrong # coordinates" error on reload This fixes the Tk error "wrong # coordinates: expected 0 or 4, got 2" that sometimes occurred when reloading. The problem was that we didn't unset the variables containing the canvas item id numbers for the displayed rows when we cleared the canvases. Thus make_secsel would think it had something to do when it didn't. Thanks to Michele Ballabio for finding a way to trigger the bug reliably. Signed-off-by: Paul Mackerras <paulus@samba.org> | 18 May 2008, 23:48:45 UTC |
| 032bea5 | Junio C Hamano | 17 May 2008, 09:02:44 UTC | builtin-apply: do not declare patch is creation when we do not know it When we see no context nor deleted line in the patch, we used to declare that the patch creates a new file. But some people create an empty file and then apply a patch to it. Similarly, a patch that delete everything is not a deletion patch either. This commit corrects these two issues. Together with the previous commit, it allows a diff between an empty file and a line-ful file to be treated as both creation patch and "add stuff to an existing empty file", depending on the context. A new test t4126 demonstrates the fix. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 09:57:33 UTC |
| 0047dd2 | Steffen Prohaska | 15 May 2008, 05:19:54 UTC | t0050: Fix merge test on case sensitive file systems On a case sensitive filesystem, "git reset --hard" might refuse to overwrite a file whose name differs only by case, even if core.ignorecase is set. It is not clear which circumstances cause this behavior. This commit simply works around the problem by removing the case changing file before running "git reset --hard". Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 09:43:26 UTC |
| 377d9c4 | Mike Ralphson | 07 May 2008, 08:35:55 UTC | Makefile: update the default build options for AIX NO_MKDTEMP is required to build, FREAD_READS_DIRECTORIES and the definition of _LARGE_FILES fix test suite failures and INTERNAL_QSORT is required for adequate performance. Tested on AIX v5.3 Maintenance Level 06 Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 09:39:30 UTC |
| 5c47f4c | Junio C Hamano | 17 May 2008, 08:51:31 UTC | builtin-apply: accept patch to an empty file A patch from a foreign SCM (or plain "diff" output) often have both preimage and postimage filename on ---/+++ lines even for a patch that creates a new file. However, when there is a filename for preimage, we used to insist the file to exist (either in the work tree and/or in the index). When we cannot be sure by parsing the patch that it is not a creation patch, we shouldn't complain when if there is no such a file. This commit fixes the logic. Refactor the code that validates the preimage file into a separate function while we are at it, as it is getting rather big. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 08:51:31 UTC |
| 88f6dba | Junio C Hamano | 17 May 2008, 08:46:47 UTC | builtin-apply: typofix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 08:46:47 UTC |
| 6d2c1c2 | Junio C Hamano | 17 May 2008, 05:10:13 UTC | Merge branch 'maint' * maint: git-filter-branch: Clarify file removal example. | 17 May 2008, 05:10:13 UTC |
| d16d5cd | Marcel Koeppen | 16 May 2008, 00:21:43 UTC | Replace in-place sed in t7502-commit The in-place mode of sed used in t7502-commit is a non-POSIX extension. That call of sed is replaced by a more portable version using a temporary file. Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2008, 05:05:22 UTC |
| e4d594c | Jon Loeliger | 16 May 2008, 19:43:50 UTC | git-filter-branch: Clarify file removal example. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2008, 20:13:24 UTC |
| be4d2c8 | Johannes Schindelin | 16 May 2008, 10:23:03 UTC | submodule update: add convenience option --init When a submodule is not initialized and you do not want to change the defaults from .gitmodules anyway, you can now say $ git submodule update --init <name> When "update" is called without --init on an uninitialized submodule, a hint to use --init is printed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2008, 20:03:55 UTC |
| bbefaa1 | Chris Frey | 16 May 2008, 02:37:31 UTC | Documentation/git-repack.txt: document new -A behaviour Add paragraph for the -A option, and describe the new behaviour that makes unreachable objects loose. Signed-off-by: Chris Frey <cdfrey@foursquare.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2008, 19:51:34 UTC |
