git, branch v1.7.0-rc2

Merge git://repo.or.cz/git-gui

2010-02-07T23:52:28Z

* git://repo.or.cz/git-gui: git-gui: update french translation git-gui: update Japanese translation git-gui: fix shortcut for menu "Commit/Revert Changes" git-gui: Quote git path when starting another gui in a submodule git-gui: update Italian translation git-gui: Update Swedish translation (520t0f0u) git-gui: use themed tk widgets with Tk 8.5 git-gui: Update German translation (12 new or changed strings). git-gui: Update translation template git-gui: Remove unused icon file_parttick git-gui: use different icon for new and modified files in the index git-gui: set GIT_DIR and GIT_WORK_TREE after setup git-gui: update shortcut tools to use _gitworktree git-gui: handle bare repos correctly git-gui: handle non-standard worktree locations git-gui: Support applying a range of changes at once git-gui: Add a special diff popup menu for submodules git-gui: Use git diff --submodule when available

Merge branch 'maint'

2010-02-07T23:52:12Z

* maint: archive: simplify archive format guessing

archive: simplify archive format guessing

2010-02-07T23:40:27Z

The code to guess an output archive's format consumed any --format options and built a new one. Jonathan noticed that it does so in an unsafe way, risking to overflow the static buffer fmt_opt. Change the code to keep the existing --format options intact and to only add a new one if a format could be guessed based on the output file name. The new option is added as the first one, allowing the existing ones to overrule it, i.e. explicit --format options given on the command line win over format guesses, as before. To simplify the code further, format_from_name() is changed to return the full --format option, thus no potentially dangerous sprintf() calls are needed any more. Reported-by: Jonathan Nieder Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Fix invalid read in quote_c_style_counted

2010-02-06T18:55:03Z

This function did not work on strings that were not NUL-terminated. It reads through a length-bounded string, searching for characters in need of quoting. After we find one, we output the quoted character, then advance our pointer to find the next one. However, we never decremented the length, meaning we ended up looking at whatever random junk was stored after the string. This bug was not found by the existing tests because most code paths feed a NUL-terminated string. The notable exception is a directory name being fed by ls-tree. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

docs: fix filter-branch example for quoted paths

2010-02-06T18:52:14Z

If there is a quoted path, update-index will correctly unquote it. However, we must take care to put our new prefix inside the double-quote. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t9501: Re-fix max load test

2010-02-06T18:33:07Z

Revert the previous attempt to skip this test on platforms where we currently cannot determine the system load. We want to make sure that the max-load-limit codepath produces results cleanly, when gitweb is updated and becomes capable of reading the load average by some other method. The code to check for load returns 0 if it doesn't know how to find load. It also checks to see if the current load is higher than the max load. So to force the script to quit early by setting the maxload variable negative which should work for systems where we can detect load (which should be a positive number) and systems where we can't (where detected load is 0) Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano

bash: support the --autosquash option for rebase

2010-02-06T17:51:43Z

Signed-off-by: Björn Gustavsson Signed-off-by: Junio C Hamano

Merge git://git.kernel.org/pub/scm/gitk/gitk

2010-02-06T05:22:59Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix copyright symbol in About box message

t9501: Skip testing load if we can't detect it

2010-02-06T05:12:06Z

Currently gitweb only knows how to check for load using /proc/loadavg, which isn't available on all systems. We shouldn't fail the test just because we don't know how to check the system load. Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.0

2010-02-06T00:36:56Z

Signed-off-by: Junio C Hamano