1. 17 Nov, 2005 6 commits
    • Eric Wong's avatar
      remove shellquote usage for tags · a7fb51d3
      Eric Wong authored
      use ',' to encode '/' in "archivename/foo--bar--0.0" so we can allow
      "--branch"-less trees which are valid in Arch ("archivename/foo--0.0")
      Signed-off-by: default avatarEric Wong <normalperson@yhbt.net>
      Signed-off-by: default avatarMartin Langhoff <martin@catalyst.net.nz>
      a7fb51d3
    • Andreas Ericsson's avatar
      daemon.c: fix arg parsing bugs · a8883288
      Andreas Ericsson authored
      Allow --init-timeout and --timeout to be specified without falling
      through to usage().
      
      Make sure openlog() is called even if implied by --inetd, or messages
      will be sent to wherever LOG_USER ends up.
      Signed-off-by: default avatarAndreas Ericsson <ae@op5.se>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      a8883288
    • Junio C Hamano's avatar
      tests: binary diff application. · fbba222f
      Junio C Hamano authored
      This adds more tests to cover cases where binary diff
      application succeeds.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      fbba222f
    • Junio C Hamano's avatar
      diff: --full-index · 80b1e511
      Junio C Hamano authored
      A new option, --full-index, is introduced to diff family.  This
      causes the full object name of pre- and post-images to appear on
      the index line of patch formatted output, to be used in
      conjunction with --allow-binary-replacement option of git-apply.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      80b1e511
    • Junio C Hamano's avatar
      apply: allow-binary-replacement. · 011f4274
      Junio C Hamano authored
      A new option, --allow-binary-replacement, is introduced.
      
      When you feed a diff that records full SHA1 name of pre- and
      post-image blob on its index line to git-apply with this option,
      the post-image blob replaces the path if what you have in the
      working tree matches the pre-image _and_ post-image blob is
      already available in the object directory.
      
      Later we _might_ want to enhance the diff output to also include
      the full binary data of the post-image, to make this more
      useful, but this is good enough for local rebasing application.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      011f4274
    • Junio C Hamano's avatar
      git-am: --resolved. · 0c15cc92
      Junio C Hamano authored
      After failed patch application, you can manually apply the patch
      (this includes resolving the conflicted merge after git-am falls
      back to 3-way merge) and run git-update-index on necessary paths
      to prepare the index file in a shape a successful patch
      application should have produced.  Then re-running git-am --resolved
      would record the resulting index file along with the commit log
      information taken from the patch e-mail.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      0c15cc92
  2. 16 Nov, 2005 15 commits
  3. 15 Nov, 2005 16 commits
  4. 14 Nov, 2005 3 commits