lp://staging/~vcs-imports/git/fe-fixes

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10516. By Johannes on 2011-08-25

setup_revisions: remember whether a ref was positive or not

This will be required by fast-export, when no commits were
exported, but the refs should be set, of course.

Signed-off-by: Johannes Schindelin <email address hidden>
Signed-off-by: Sverre Rabbelier <email address hidden>

10515. By Johannes on 2011-08-25

fast-export: do not export negative refs

When calling `git fast-export master..next` we want to export
refs/heads/next, but not refs/heads/master.

Currently this is not a problem, because negative refs' commits
are never shown. In the next commit this will be changed in order
to make sure that 'master..master' does export master. I.e. even
refs whose commits are not shown are exported.

Signed-off-by: Johannes Schindelin <email address hidden>
Signed-off-by: Sverre Rabbelier <email address hidden>

10514. By Johannes on 2011-08-25

setup_revisions: remember whether a ref was positive or not

This will be required by fast-export, when no commits were
exported, but the refs should be set, of course.

Signed-off-by: Johannes Schindelin <email address hidden>
Signed-off-by: Sverre Rabbelier <email address hidden>

10513. By Johannes on 2011-08-25

fast-export: do not refer to non-existing marks

When calling `git fast-export a..a b` when a and b refer to the same
commit, nothing would be exported, and an incorrect reset line would
be printed for b ('from :0').

Signed-off-by: Johannes Schindelin <email address hidden>
Signed-off-by: Sverre Rabbelier <email address hidden>

10512. By Sverre Rabbelier on 2011-08-25

t9350: point out that refs are not updated correctly

This happens only when the corresponding commits are not exported in
the current fast-export run. This can happen either when the relevant
commit is already marked, or when the commit is explicitly marked
as UNINTERESTING with a negative ref by another argument.

This breaks fast-export basec remote helpers.

Signed-off-by: Sverre Rabbelier <email address hidden>

10511. By Junio C Hamano <email address hidden> on 2011-08-24

Merge branch 'jc/merge-reword' into next

* jc/merge-reword:
  merge: reword the final message

10510. By Junio C Hamano <email address hidden> on 2011-08-24

Merge branch 'nk/branch-v-abbrev' into next

* nk/branch-v-abbrev:
  branch -v: honor core.abbrev

10509. By Junio C Hamano <email address hidden> on 2011-08-24

Merge branch 'hv/submodule-update-none' into next

* hv/submodule-update-none:
  add update 'none' flag to disable update of submodule by default
  submodule: move update configuration variable further up

10508. By Junio C Hamano <email address hidden> on 2011-08-24

Merge branch 'ci/forbid-unwanted-current-branch-update' into next

* ci/forbid-unwanted-current-branch-update:
  Show interpreted branch name in error messages
  Prevent force-updating of the current branch

10507. By Junio C Hamano <email address hidden> on 2011-08-24

Merge branch 'jc/lookup-object-hash' into next

* jc/lookup-object-hash:
  object hash: replace linear probing with 4-way cuckoo hashing
  object hash: we know the table size is a power of two
  object hash: next_size() helper for readability
  pack-objects --count-only
  object.c: remove duplicated code for object hashing
  object.c: code movement for readability