Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 25 7月, 2009 1 次提交
  3. 23 7月, 2009 3 次提交
    • S
      Trailing whitespace and no newline fix · 735c6744
      由 SZEDER Gábor 提交于 
      If a patch adds a new line to the end of a file and this line ends with
one trailing whitespace character and has no newline, then
'--whitespace=fix' currently does not remove that trailing whitespace.

This patch fixes this by removing the check for trailing whitespace at
the end of the line at a hardcoded offset which does not take the
eventual absence of newline into account.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      735c6744
    • J
      diff --cc: a lost line at the beginning of the file is shown incorrectly · b810cbbd
      由 Junio C Hamano 提交于 
      When combine-diff inspected the diff from one parent to the merge result,
it misinterpreted a header in the form @@ -l,k +0,0 @@.

This hunk header means that K lines were removed from the beginning of the
file, so the lost lines must be queued to the sline that represents the
first line of the merge result, but we incremented our pointer incorrectly
and ended up queuing it to the second line, which in turn made the lossage
appear _after_ the first line.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b810cbbd
    • J
      combine-diff.c: fix performance problem when folding common deleted lines · 55d5d5ba
      由 Junio C Hamano 提交于 
      For a deleted line in a patch with the parent we are looking at, the
append_lost() function finds the same line among a run of lines that were
deleted from the same location by patches from parents we previously
checked.  This is so that patches with two parents

    @@ -1,4 +1,3 @@    @@ -1,4 +1,3 @@
     one                   one
    -two                  -two
     three                 three
    -quatro               -fyra
    +four                 +four

can be coalesced into this sequence, reusing one line that describes the
removal of "two" for both parents.

   @@@ -1,4 -1,4 +1,3 @@@
     one
   --two
     three
   - quatro
    -frya
   ++four

While reading the second patch (that removes "two" and then "fyra"), after
finding where removal of the "two" matches, we need to find existing
removal of "fyra" (if exists) in the removal list, but the match has to
happen after all the existing matches (in this case "two").  The code used
a naïve O(n^2) algorithm to compute this by scanning the whole removal
list over and over again.

This patch remembers where the next scan should be started in the existing
removal list to avoid this.

Noticed by Linus Torvalds.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      55d5d5ba
  5. 19 7月, 2009 1 次提交
    • J
      checkout -f: deal with a D/F conflict entry correctly · 78d3b06e
      由 Junio C Hamano 提交于 
      When we switch branches with "checkout -f", unpack_trees() feeds two
cache_entries to oneway_merge() function in its src[] array argument.  The
zeroth entry comes from the current index, and the first entry represents
what the merge result should be, taken from the tree recorded in the
commit we are switching to.

When we have a blob (either regular file or a symlink) in the index and in
the work tree at path "foo", and the switched-to tree has "foo/bar",
i.e. "foo" becomes a directory, src[0] is obviously that blob currently
registered at "foo".  Even though we do not have anything at "foo" in the
switched-to tree, src[1] is _not_ NULL in this case.

The unpack_trees() machinery places a special marker df_conflict_entry
to signal that no blob exists at "foo", but it will become a directory
that may have somthing underneath it (namely "foo/bar"), so a usual 3-way
merge can notice the situation.

But oneway_merge() codepath failed to notice this and passed the special
marker directly to merged_entry().  This happens to remove the "foo" in
the end because the df_conflict_entry does not have any name (hence the
"error" message) and its addition in add_index_entry() is rejected, but it
is wrong.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Acked-by: NLinus Torvalds <torvalds@linux-foundation.org>
      78d3b06e
  7. 17 7月, 2009 2 次提交
  9. 09 7月, 2009 3 次提交
  11. 02 7月, 2009 1 次提交
    • M
      request-pull: really really disable pager · 653a31c1
      由 Michal Marek 提交于 
      Earlier 476cc724 (request-pull: really disable pager, 2009-06-30)
tried to use the correct environment variable to disable paging
from multiple calls to "git log" and friends, but there was one
extra call to "git log" that was not covered by the trick.

Move the setting and exporting of GIT_PAGER much earlier in the
script to cover everybody.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      653a31c1
  13. 01 7月, 2009 5 次提交
  15. 28 6月, 2009 3 次提交
  17. 26 6月, 2009 1 次提交
    • C
      git-remote: fix missing .uploadpack usage for show command · 345a3803
      由 Chris Frey 提交于 
      For users pulling from machines with self compiled git installs,
in non-PATH locations, they can set the config option
remote.<name>.uploadpack to set the location of git-upload-pack.

When using 'git remote show <name>', the remote HEAD check
did not use the uploadpack configuration setting, and would
not use the configured program.

In builtin-remote.c, the config setting is already loaded
with the call to remote_get(), so this patch passes that remote
along to transport_get().
Signed-off-by: NChris Frey <cdfrey@foursquare.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      345a3803
  19. 24 6月, 2009 1 次提交
  21. 22 6月, 2009 11 次提交
  23. 21 6月, 2009 6 次提交
  25. 19 6月, 2009 2 次提交