commit d16520499d2652b5b59dfb25f9cf2d56a4c6913a
Author: Pete Wyckoff <pw@padd.com>
Date:   Sat Dec 17 12:39:03 2011 -0500

    git-p4: fix skipSubmitEdit regression

    Commit 7c766e5 (git-p4: introduce skipSubmitEdit, 2011-12-04)
    made it easier to automate submission to p4, but broke the most
    common case.

    Add a test for when the user really does edit and save the change
    template, and fix the bug that causes the test to fail.

    Also add a confirmation message when submission is cancelled.

    Reported-by: Michael Horowitz <michael.horowitz@ieee.org>
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit ee228024933069b93ce23a1bd5eeb7ae12c792f2
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:45:03 2011 -0800

    Update draft release notes to 1.7.9

    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit a2add8570c90e14e8e0cedae935091f100c758dc
Merge: 48b3036 bc82189
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:33:56 2011 -0800

    Merge branch 'jc/commit-amend-no-edit'

    * jc/commit-amend-no-edit:
      test: commit --amend should honor --no-edit
      commit: honour --no-edit
      t7501 (commit): modernize style
      test: remove a porcelain test that hard-codes commit names
      test: add missing "&&" after echo command

commit 48b303675aa238c209e527feadcbb7ba1c025c97
Merge: e45c9b0 568508e
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:33:40 2011 -0800

    Merge branch 'jc/stream-to-pack'

    * jc/stream-to-pack:
      bulk-checkin: replace fast-import based implementation
      csum-file: introduce sha1file_checkpoint
      finish_tmp_packfile(): a helper function
      create_tmp_packfile(): a helper function
      write_pack_header(): a helper function

    Conflicts:
        pack.h

commit e45c9b03c32620c444f464403c23534160998624
Merge: e9bba53 0becb3e
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:33:37 2011 -0800

    Merge branch 'aw/rebase-i-stop-on-failure-to-amend'

    * aw/rebase-i-stop-on-failure-to-amend:
      rebase -i: interrupt rebase when "commit --amend" failed during "reword"

commit e9bba5340e1ba370bb2f64a514c87fdaf417d6d7
Merge: 0bbaa5c 1838685
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:33:34 2011 -0800

    Merge branch 'jh/fast-import-notes'

    * jh/fast-import-notes:
      fast-import: Fix incorrect fanout level when modifying existing notes refs
      t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
      t9301: Fix testcase covering up a bug in fast-import's notes fanout handling

commit 0bbaa5c076f51a0eb3ab4f53bbc5a32ce66cf954
Merge: 09bb4eb 1bc01ef
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:33:30 2011 -0800

    Merge branch 'jk/upload-archive-use-start-command'

    * jk/upload-archive-use-start-command:
      upload-archive: use start_command instead of fork

commit 09bb4eb4f14c0b92baa649b2b97cda2390b84b84
Merge: 10f4eb6 811c70f
Author: Junio C Hamano <gitster@pobox.com>
Date:   Fri Dec 16 22:18:42 2011 -0800

    Merge git://ozlabs.org/~paulus/gitk

    * git://ozlabs.org/~paulus/gitk:
      gitk: Make vi-style keybindings more vi-like
      gitk: Make "touching paths" search support backslashes
      gitk: Show modified files with separate work tree
      gitk: Simplify calculation of gitdir
      gitk: Run 'git rev-parse --git-dir' only once
      gitk: Put temporary directory inside .git
      gitk: Fix "External diff" with separate work tree
      gitk: Fix "blame parent commit" with separate work tree
      gitk: Fix "show origin of this line" with separate work tree
      gitk: Fix file highlight when run in subdirectory
      gitk: Update copyright
      gitk: When a commit contains a note, mark it with a yellow box
      gitk: Remember time zones from author and commit timestamps
      gitk: Remove unused $cdate array

commit 10f4eb652ee4e592f91f638e579d1afcb96c0408
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 23:09:27 2011 -0800

    Update draft release notes to 1.7.9

    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit b3f17ac3d6609c1ccede32ef783d4f2e92e7eba6
Merge: 91c23f7 d3e0598
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 23:03:00 2011 -0800

    Merge branch 'ks/tag-cleanup'

    * ks/tag-cleanup:
      git-tag: introduce --cleanup option

    Conflicts:
        builtin/tag.c

commit 91c23f76cec4a4ec9b9143b7ebb31e639856ed16
Merge: 357ba5c 6a5ceda
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 23:00:52 2011 -0800

    Merge branch 'jl/submodule-status-failure-report'

    * jl/submodule-status-failure-report:
      diff/status: print submodule path when looking for changes fails

commit 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6
Merge: b661a4b 37e7793
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:57:19 2011 -0800

    Merge branch 'tr/userdiff-c-returns-pointer'

    * tr/userdiff-c-returns-pointer:
      userdiff: allow * between cpp funcname words

commit b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5
Merge: 424f30a cc64b31
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:56:22 2011 -0800

    Merge branch 'bc/maint-apply-check-no-patch'

    * bc/maint-apply-check-no-patch:
      builtin/apply.c: report error on failure to recognize input
      t/t4131-apply-fake-ancestor.sh: fix broken test

commit 424f30a5ae3ff26fca14df71cce31b06d1dec919
Merge: b2dd021 c1d7036
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:55:07 2011 -0800

    Merge branch 'nd/ignore-might-be-precious'

    * nd/ignore-might-be-precious:
      checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore

commit b2dd02112052aff875e8dc7d12b9915c91feafe2
Merge: a96a89f 39bd6f7
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:53:08 2011 -0800

    Merge branch 'jn/branch-move-to-self'

    * jn/branch-move-to-self:
      Allow checkout -B <current-branch> to update the current branch
      branch: allow a no-op "branch -M <current-branch> HEAD"

commit a96a89f7153150c7e59d5481dd22773173b5a877
Merge: 5c36594 284e3d2
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:49:45 2011 -0800

    Merge branch 'cn/maint-lf-to-crlf-filter'

    * cn/maint-lf-to-crlf-filter:
      convert: track state in LF-to-CRLF filter

commit 5c3659432da19098261737d69b7979336d5d0159
Merge: 3c4b5ad 3686aa1
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:49:19 2011 -0800

    Merge branch 'tj/maint-imap-send-remove-unused'

    * tj/maint-imap-send-remove-unused:
      imap-send: Remove unused 'use_namespace' variable

commit 3c4b5ad5a5d4356948f1207908bd3ba62b1a7773
Merge: 6fa625a 7b51c33
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:47:38 2011 -0800

    Merge branch 'jk/maint-upload-archive'

    * jk/maint-upload-archive:
      archive: don't let remote clients get unreachable commits

commit 6fa625a6b757b6aaaf4aaca64a5bd8c038cfb1e8
Merge: 9e6324c 6ae683c
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:46:57 2011 -0800

    Merge branch 'jn/gitweb-side-by-side-diff'

    * jn/gitweb-side-by-side-diff:
      gitweb: Add navigation to select side-by-side diff
      gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
      t9500: Add basic sanity tests for side-by-side diff in gitweb
      t9500: Add test for handling incomplete lines in diff by gitweb
      gitweb: Give side-by-side diff extra CSS styling
      gitweb: Add a feature to show side-by-side diff
      gitweb: Extract formatting of diff chunk header
      gitweb: Refactor diff body line classification

commit 9e6324c4d784c36d2558ccdea7c8470ac2701437
Merge: 73c6b35 7b6c583
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:18:00 2011 -0800

    Merge branch 'maint'

    * maint:
      Update draft release notes for 1.7.8.1
      Git 1.7.7.5
      Git 1.7.6.5
      blame: don't overflow time buffer
      fetch: create status table using strbuf

    Conflicts:
        RelNotes

commit 7b6c5836cf02999955b68c79f1cf2d13040acbc3
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:08:52 2011 -0800

    Update draft release notes for 1.7.8.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit 2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6
Merge: 68f80f5 f63c79d
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:04:50 2011 -0800

    Merge branch 'jc/maint-pack-object-cycle' into maint

    * jc/maint-pack-object-cycle:
      pack-object: tolerate broken packs that have duplicated objects

    Conflicts:
        builtin/pack-objects.c

commit 68f80f549092bcbb2409ba9c0eace73c085ba7cc
Merge: fc54543 68be2fe
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:03:36 2011 -0800

    Merge branch 'jc/index-pack-reject-dups' into maint

    * jc/index-pack-reject-dups:
      receive-pack, fetch-pack: reject bogus pack that records objects twice

commit fc545433bdab7ec17e6609d2249771d407370a4d
Merge: df6246e 093c44a
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:03:17 2011 -0800

    Merge branch 'mf/curl-select-fdset' into maint

    * mf/curl-select-fdset:
      http: drop "local" member from request struct
      http.c: Rely on select instead of tracking whether data was received
      http.c: Use timeout suggested by curl instead of fixed 50ms timeout
      http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping

commit df6246ed78d040f06f095dd62d8db07a0aa19a96
Merge: 8311158 ea4f968
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 22:02:51 2011 -0800

    Merge branch 'nd/misc-cleanups' into maint

    * nd/misc-cleanups:
      unpack_object_header_buffer(): clear the size field upon error
      tree_entry_interesting: make use of local pointer "item"
      tree_entry_interesting(): give meaningful names to return values
      read_directory_recursive: reduce one indentation level
      get_tree_entry(): do not call find_tree_entry() on an empty tree
      tree-walk.c: do not leak internal structure in tree_entry_len()

commit 8311158c66e0d83df950ea837fb1cb332c51f798
Merge: 10dd3b2 66c11f0
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:58:51 2011 -0800

    Merge branch 'maint-1.7.7' into maint

    * maint-1.7.7:
      Git 1.7.7.5
      Git 1.7.6.5
      blame: don't overflow time buffer
      fetch: create status table using strbuf
      checkout,merge: loosen overwriting untracked file check based on info/exclude
      cast variable in call to free() in builtin/diff.c and submodule.c
      apply: get rid of useless x < 0 comparison on a size_t type

    Conflicts:
        Documentation/git.txt
        GIT-VERSION-GEN
        RelNotes
        builtin/fetch.c

commit 66c11f02b031aca6f1756086fefdf4b8a5575c56
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:55:31 2011 -0800

    Git 1.7.7.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit c0eb9ccfb97297e25ccbab0481159282147b353f
Merge: 3b42565 83838d5
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:47:51 2011 -0800

    Merge branch 'ab/clang-lints' into maint-1.7.7

    * ab/clang-lints:
      cast variable in call to free() in builtin/diff.c and submodule.c
      apply: get rid of useless x < 0 comparison on a size_t type

commit 3b425656a469722d9c45b7c88e0e01a9cd8c0fd3
Merge: 7857e32 fc001b5
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:47:08 2011 -0800

    Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7

    * nd/maint-ignore-exclude:
      checkout,merge: loosen overwriting untracked file check based on info/exclude

commit 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b
Merge: 7919704 15b7898
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:44:56 2011 -0800

    Merge branch 'maint-1.7.6' into maint-1.7.7

    * maint-1.7.6:
      Git 1.7.6.5
      blame: don't overflow time buffer
      fetch: create status table using strbuf

    Conflicts:
        Documentation/git.txt
        GIT-VERSION-GEN
        RelNotes

commit 15b7898c5e9fc6fed9a6064213cfcd08cf7d7314
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:30:40 2011 -0800

    Git 1.7.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit 52b195f2b8e0d8c9d4583aab44846698ed3149f2
Merge: 43176d1 5914f2d
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:21:30 2011 -0800

    Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6

    * jk/maint-fetch-status-table:
      fetch: create status table using strbuf

commit 43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b
Merge: 6d1cdad e8b14d7
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:12:34 2011 -0800

    Merge branch 'jc/maint-name-rev-all' into maint-1.7.6

    * jc/maint-name-rev-all:
      name-rev --all: do not even attempt to describe non-commit object

commit 6d1cdadbeeb03f40250526e29b1f1a91582911d8
Merge: c3ea051 74b531f
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 21:12:14 2011 -0800

    Merge branch 'ml/mailmap' into maint-1.7.6

    * ml/mailmap:
      mailmap: xcalloc mailmap_info

    Conflicts:
        mailmap.c

commit c3ea051544cb1d98a5ae7f64d077084a9a5db5c1
Author: Jeff King <peff@peff.net>
Date:   Thu Dec 8 05:25:54 2011 -0500

    blame: don't overflow time buffer

    When showing the raw timestamp, we format the numeric
    seconds-since-epoch into a buffer, followed by the timezone
    string. This string has come straight from the commit
    object. A well-formed object should have a timezone string
    of only a few bytes, but we could be operating on data
    pushed by a malicious user.

    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit 73c6b3575bc638b7096ec913bd91193707e2265d
Merge: 57526fd 942e6ba
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Dec 13 16:48:24 2011 -0800

    Merge branch 'master' of git://repo.or.cz/git-gui

    * 'master' of git://repo.or.cz/git-gui: (28 commits)
      git-gui 0.16
      git-gui: handle shell script text filters when loading for blame.
      git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.
      git-gui: added config gui.gcwarning to disable the gc hint message
      git-gui: set whitespace warnings appropriate to this project
      git-gui: don't warn for detached head when rebasing
      git-gui: make config gui.warndetachedcommit a boolean
      git-gui: add config value gui.diffopts for passing additional diff options
      git-gui: sort the numeric ansi codes
      git-gui: support underline style when parsing diff output
      git-gui: fix spelling error in sshkey.tcl
      git-gui: include the file path in guitools confirmation dialog
      git-gui: span widgets over the full file output area in the blame view
      git-gui: use a tristate to control the case mode in the searchbar
      git-gui: set suitable extended window manager hints.
      git-gui: fix display of path in browser title
      git-gui: enable the smart case sensitive search only if gui.search.smartcase is true
      git-gui: catch invalid or complete regular expressions and treat as no match.
      git-gui: theme the search and line-number entry fields on blame screen
      git-gui: include the number of untracked files to stage when asking the user
      ...

commit 942e6baa92846e5628752c65a22bc4957d8de4d0
Author: Pat Thoyts <patthoyts@users.sourceforge.net>
Date:   Tue Dec 13 23:44:30 2011 +0000

    git-gui 0.16

    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

commit 57526fde5df201a99afa6d122c3266b3a1c5673a
Author: Pete Wyckoff <pw@padd.com>
Date:   Fri Dec 9 18:48:17 2011 -0500

    git-p4: test for absolute PWD problem

    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit bf1d68ff4c86f6d6fb3214ae9b0dc9c7ac0ff781
Author: Gary Gibbons <ggibbons@perforce.com>
Date:   Fri Dec 9 18:48:16 2011 -0500

    git-p4: use absolute directory for PWD env var

    P4 only looks at the environment variable $PWD to figure out
    where it is, so chdir() has code to set that every time.  But
    when the clone --destination is not an absolute path, PWD will
    not be absolute and P4 won't be able to find any files expected
    to be in the current directory.  Fix this by expanding PWD to
    an absolute path.

    One place this crops up is when using a P4CONFIG environment
    variable to specify P4 parameters, such as P4USER or P4PORT.
    Setting P4CONFIG=.p4config works for p4 invocations from the
    current directory.  But if the value of PWD is not absolute, it
    fails.