summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-12-04git-p4: Fix bug in p4Where method.Libravatar Tor Arvid Lund1-1/+9
When running: p4 where //depot/SomePath/... The result can in some situations look like: //depot/SomePath/... //client/SomePath/... /home/user/p4root/SomePath/... -//depot/SomePath/UndesiredSubdir/... //client/SomePath/UndesiredSubdir/... /home/user/p4root/SomePath/UndesiredSubdir/... This depends on the users Client view. The current p4Where method will now return /home/user/p4root/SomePath/UndesiredSubdir/... which is not what we want. This patch loops through the results from "p4 where", and picks the one where the depotFile exactly matches the given depotPath (//depot/SomePath/... in this example). Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-04Report symlink failures in merge-recursiveLibravatar Alex Riesen1-1/+2
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-04Make chdir failures visibleLibravatar Alex Riesen2-3/+4
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-04Make some of fwrite/fclose/write/close failures visibleLibravatar Alex Riesen3-15/+45
So that full filesystem conditions or permissions problems won't go unnoticed. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03Merge branch 'dm/svn-remote'Libravatar Junio C Hamano2-1/+20
* dm/svn-remote: git-svn: Make branch use correct svn-remote
2008-12-03Merge branch 'jn/gitweb-utf8'Libravatar Junio C Hamano1-16/+16
* jn/gitweb-utf8: gitweb: Fix handling of non-ASCII characters in inserted HTML files
2008-12-03add stage to gitignoreLibravatar Jeff King1-0/+1
This is a generated builtin since 24b1f65f (Install git-stage in exec-path). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03submodule: use git rev-parse -qLibravatar Miklos Vajna1-3/+3
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03rebase: use git rev-parse -qLibravatar Miklos Vajna1-2/+2
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03pull: use git rev-parse -qLibravatar Miklos Vajna1-4/+4
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03lost-found: use git rev-parse -qLibravatar Miklos Vajna1-1/+1
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03filter-branch: use git rev-parse -qLibravatar Miklos Vajna1-1/+1
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03git-svn: Make branch use correct svn-remoteLibravatar Deskin Miller2-1/+20
The 'branch' subcommand incorrectly had the svn-remote to use hardcoded as 'svn', the default remote name. This meant that branches derived from other svn-remotes would try to use the branch and tag configuration for the 'svn' remote, potentially copying would-be branches to the wrong place in SVN, into the branch namespace for another project. Fix this by using the remote name extracted from the svn info for the specified git ref. Add a testcase for this behaviour. [jc: squashed in a fix to test from Michael J Gruber for older svn (1.4)] Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-03Merge branch 'jc/rm-i-t-a'Libravatar Junio C Hamano8-32/+187
* jc/rm-i-t-a: git add --intent-to-add: do not let an empty blob be committed by accident git add --intent-to-add: fix removal of cached emptiness builtin-rm.c: explain and clarify the "local change" logic Extend index to save more flags
2008-12-03Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
* maint: xdiff: give up scanning similar lines early
2008-12-03Install git-stage in exec-pathLibravatar Junio C Hamano1-0/+1
Earlier the plan was to eventually eradicate git-foo executables from the filesystem for all the built-in commands, but when we released 1.6.0 we decided not to do so. Instead, it has been promised that by prepending the output from $(git --exec-path) to your $PATH, you can keep using the dashed form of commands. This also allows "git stage" to appear in the autogenerated command list, which is used to offer man pages by "git help" command. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Merge branch 'jk/maint-commit-v-strip' into maintLibravatar Junio C Hamano2-3/+78
* jk/maint-commit-v-strip: commit: Fix stripping of patch in verbose mode.
2008-12-02xdiff: give up scanning similar lines earlyLibravatar Davide Libenzi1-2/+13
In a corner case of large files whose lines do not match uniquely, the loop to eliminate a line that matches multiple locations adjacent to a run of lines that do not uniquely match wasted too much cycles. Fix this by giving up early after scanning 100 lines in both direction. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Merge branch 'bc/maint-keep-pack' into maintLibravatar Junio C Hamano9-36/+137
* bc/maint-keep-pack: repack: only unpack-unreachable if we are deleting redundant packs t7700: test that 'repack -a' packs alternate packed objects pack-objects: extend --local to mean ignore non-local loose objects too sha1_file.c: split has_loose_object() into local and non-local counterparts t7700: demonstrate mishandling of loose objects in an alternate ODB builtin-gc.c: use new pack_keep bitfield to detect .keep file existence repack: do not fall back to incremental repacking with [-a|-A] repack: don't repack local objects in packs with .keep file pack-objects: new option --honor-pack-keep packed_git: convert pack_local flag into a bitfield and add pack_keep t7700: demonstrate mishandling of objects in packs with a .keep file
2008-12-02Merge branch 'js/mingw-rename-fix' into maintLibravatar Junio C Hamano1-3/+12
* js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files
2008-12-02gitweb: Fix handling of non-ASCII characters in inserted HTML filesLibravatar Jakub Narebski1-16/+16
Use new insert_file() subroutine to insert HTML chunks from external files: $site_header, $home_text (by default indextext.html), $site_footer, and $projectroot/$project/REAME.html. All non-ASCII chars of those files will be broken by Perl IO layer without decoding to utf8, so insert_file() does to_utf8() on each printed line; alternate solution would be to open those files with "binmode $fh, ':utf8'", or even all files with "use open qw(:std :utf8)". Note that inserting README.html lost one of checks for simplicity. Noticed-by: Tatsuki Sugiura <sugi@nemui.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02git-stash: use git rev-parse -qLibravatar Miklos Vajna1-6/+6
Don't redirect stderr to /dev/null, use -q to suppress the output on stderr. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Merge branch 'maint'Libravatar Junio C Hamano1-1/+0
* maint: User's Manual: remove duplicated url at the end of Appendix B
2008-12-02t4030-diff-textconv: Make octal escape sequence more portableLibravatar Johannes Sixt1-1/+1
There are printfs around that do not grok '\1', but need '\01'. Discovered on AIX 4.3.x. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Add a built-in alias for 'stage' to the 'add' commandLibravatar Scott Chacon2-0/+20
This comes from conversation at the GitTogether where we thought it would be helpful to be able to teach people to 'stage' files because it tends to cause confusion when told that they have to keep 'add'ing them. This continues the movement to start referring to the index as a staging area (eg: the --staged alias to 'git diff'). Also adds a doc file for 'git stage' that basically points to the docs for 'git add'. Signed-off-by: Scott Chacon <schacon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Add backslash to list of 'crud' characters in real nameLibravatar Linus Torvalds1-0/+1
We remove crud characters at the beginning and end of real-names so that when we see email addresses like From: "David S. Miller" <davem@davemloft.net> we drop the quotes around the name when we parse that and split it up into name and email. However, the list of crud characters was basically just a random list of common things that are found around names, and it didn't contain the backslash character that some insane scripts seem to use when quoting things. So now the kernel has a number of authors listed like Author: \"Rafael J. Wysocki\ <rjw@sisk.pl> because the author name had started out as From: \"Rafael J. Wysocki\" <rjw@sisk.pl> and the only "crud" character we noticed and removed was the final double-quote at the end. We should probably do better quote removal from names anyway, but this is the minimal obvious patch. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Makefile: introduce NO_PTHREADSLibravatar Junio C Hamano4-1/+31
This introduces make variable NO_PTHREADS for platforms that lack the support for pthreads library or people who do not want to use it for whatever reason. When defined, it makes the multi-threaded index preloading into a no-op, and also disables threaded delta searching by pack-objects. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Johannes Sixt <j6t@kdbg.org> (AIX 4.3.x) Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Documentation: describe how to "bisect skip" a range of commitsLibravatar Christian Couder2-2/+21
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2008-12-02bisect: fix "git bisect skip <commit>" and add tests casesLibravatar Christian Couder2-3/+20
The patch that allows "git bisect skip" to be passed a range of commits using the "<commit1>..<commit2>" notation is flawed because it introduces a regression when it was passed a simple rev or commit. "git bisect skip <commit>" doesn't work any more, because <commit> is quoted but not properly unquoted. This patch fixes that and add tests cases to better check when it is passed commits and range of commits. While at it, this patch also properly quotes the non range arguments using the "sq" function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2008-12-02Update comment on gitweb_check/get_featureLibravatar Giuseppe Bilotta1-1/+3
This is taken from a patch from Giuseppe but unfortunately it came too late to replace the series that was already on "next". The comment he updated here is better than the version we had previously, so I am cherry-picking this bit not to lose it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02Merge branch 'gb/gitweb-feature'Libravatar Junio C Hamano1-16/+32
* gb/gitweb-feature: gitweb: make gitweb_check_feature a boolean wrapper gitweb: rename gitweb_check_feature to gitweb_get_feature gitweb: fix 'ctags' feature check and others
2008-12-02Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano1-16/+27
* git://repo.or.cz/git-gui: git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.
2008-12-02Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano2-17/+55
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add a menu option to start git gui gitk: Make line origin search update the busy status gitk: Update German translation gitk: Fix bug in accessing undefined "notflag" variable gitk: Highlight only when search type is "containing:". gitk: Fix context menu items for generating diffs when in tree mode
2008-12-02User's Manual: remove duplicated url at the end of Appendix BLibravatar Miklos Vajna1-1/+0
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-02git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror.Libravatar Mark Burton1-16/+27
When the destination repository is a mirror, this function goofed by still passing a refspec to git-push. Now it notices that the remote is a mirror and holds the refspec. Signed-off-by: Mark Burton <markb@ordern.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-12-02gitk: Add a menu option to start git guiLibravatar Alexander Gavrilov1-0/+3
Git gui already has menu commands to start gitk, and this makes the relation symmetric. [paulus@samba.org - changed "Git Gui" in the menu item to "git gui"] Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-12-02gitk: Make line origin search update the busy statusLibravatar Alexander Gavrilov1-0/+3
Currently the 'show origin of this line' feature does not update the status field of the gitk window, so it is not evident that any processing is going on. It may seem at first that clicking the item had no effect. This commit adds calls to set and clear the busy status with an appropriate title, similar to other search commands. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-12-02gitk: Update German translationLibravatar Christian Stimming1-8/+43
This takes into account the most recent po file merge. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-12-02gitk: Fix bug in accessing undefined "notflag" variableLibravatar Paul Mackerras1-5/+1
As pointed out by Johannes Sixt and Alexander Gavrilov, commit 2958228430b63f2e38c55519d1f98d8d6d9e23f3 ("gitk: Fix switch statement in parseviewargs") exposed a latent bug in that $notflag was never initialized. Since it isn't used either, this removes it entirely. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-12-02gitk: Highlight only when search type is "containing:".Libravatar Paul Mackerras1-3/+4
When the search type is "touching paths" or "adding/removing string", it's not very useful to highlight instances of the search string in the commit message, headline or author name, so this disables the highlighting in those cases. This was suggested by Mark Burton <markb@ordern.com>, but the implementation is different to his patch, which tested $gdttype at each place where $markingmatches was tested. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-12-01GIT 1.6.1-rc1Libravatar Junio C Hamano1-4/+15
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-01Include git-gui--askpass in git-gui RPM packageLibravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-30Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-93/+157
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Avoid handling the Return key twice in Add Branch gitk: Show local changes properly when we have a path limit gitk: Fix switch statement in parseviewargs gitk: Index line[hnd]tag arrays by id rather than row number
2008-11-30Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano5-1533/+4243
* git://repo.or.cz/git-gui: git-gui: update Japanese translation git-gui: french translation update Updated Swedish translation (514t0f0u). git gui: update Italian translation Update Hungarian translation. 100% completed.
2008-11-30send-email: do not reverse the command line argumentsLibravatar Junio C Hamano2-1/+14
The loop picks elements from @ARGV one by one, sifts them into arguments meant for format-patch and the script itself, and pushes them to @files and @rev_list_opts arrays. Pick elements from @ARGV starting at the beginning using shift, instead of at the end using pop, as push appends them to the end of the array. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-30Merge branch 'maint'Libravatar Junio C Hamano2-1/+23
* maint: Update draft release notes to 1.6.0.5 generate-cmdlist.sh: avoid selecting synopsis at wrong place
2008-11-30Update draft release notes to 1.6.0.5Libravatar Junio C Hamano1-0/+22
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-30Merge branch 'st/maint-tag' into maintLibravatar Junio C Hamano2-7/+23
* st/maint-tag: tag: Add more tests about mixing incompatible modes and options tag: Check that options are only allowed in the appropriate mode
2008-11-30Merge branch 'mk/maint-cg-push' into maintLibravatar Junio C Hamano3-5/+75
* mk/maint-cg-push: git push: Interpret $GIT_DIR/branches in a Cogito compatible way
2008-11-30generate-cmdlist.sh: avoid selecting synopsis at wrong placeLibravatar Nguyễn Thái Ngọc Duy1-1/+1
In "common" man pages there is luckily no "NAME" anywhere except at beginning of documents. If there is another "NAME", sed could mis-select it and lead to common-cmds.h corruption. So better nail it at beginning of line, which would reduce corruption chance. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>