undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Make test scripts executable.
  bundle create: keep symbolic refs' names instead of resolving them
This commit is contained in:
Junio C Hamano 2007-11-22 16:51:18 -08:00
commit fa30383642
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundle.c
View File

@ -6,6 +6,7 @@
#include "revision.h" #include "revision.h"
#include "list-objects.h" #include "list-objects.h"
#include "run-command.h" #include "run-command.h"
#include "refs.h"
static const char bundle_signature[] = "# v2 git bundle\n"; static const char bundle_signature[] = "# v2 git bundle\n";
@ -232,11 +233,17 @@ int create_bundle(struct bundle_header *header, const char *path,
struct object_array_entry *e = revs.pending.objects + i; struct object_array_entry *e = revs.pending.objects + i;
unsigned char sha1[20]; unsigned char sha1[20];
char *ref; char *ref;
const char *display_ref;
int flag;
if (e->item->flags & UNINTERESTING) if (e->item->flags & UNINTERESTING)
continue; continue;
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1) if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
continue; continue;
if (!resolve_ref(e->name, sha1, 1, &flag))
flag = 0;
display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
/* /*
* Make sure the refs we wrote out is correct; --max-count and * Make sure the refs we wrote out is correct; --max-count and
* other limiting options could have prevented all the tips * other limiting options could have prevented all the tips
@ -287,7 +294,7 @@ int create_bundle(struct bundle_header *header, const char *path,
ref_count++; ref_count++;
write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40); write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, " ", 1);
write_or_die(bundle_fd, ref, strlen(ref)); write_or_die(bundle_fd, display_ref, strlen(display_ref));
write_or_die(bundle_fd, "\n", 1); write_or_die(bundle_fd, "\n", 1);
free(ref); free(ref);
} }

0
t/t4018-diff-funcname.sh Normal file → Executable file
View File

13
t/t5510-fetch.sh
View File

@ -215,4 +215,17 @@ test_expect_success 'quoting of a strangely named repo' '
grep "fatal: '\''a\\\\!'\''b'\''" result grep "fatal: '\''a\\\\!'\''b'\''" result
' '
test_expect_success 'bundle should record HEAD correctly' '
cd "$D" &&
git bundle create bundle5 HEAD master &&
git bundle list-heads bundle5 >actual &&
for h in HEAD refs/heads/master
do
echo "$(git rev-parse --verify $h) $h"
done >expect &&
diff -u expect actual
'
test_done test_done

0
t/t7501-commit.sh Normal file → Executable file
View File