mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-pack: track errors for each ref

Browse Source 
Instead of keeping the 'ret' variable, we instead have a
status flag for each ref that tracks what happened to it.
We then print the ref status after all of the refs have
been examined.

This paves the way for three improvements:
  - updating tracking refs only for non-error refs
  - incorporating remote rejection into the printed status
  - printing errors in a different order than we processed
    (e.g., consolidating non-ff errors near the end with
    a special message)

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2007-11-17 07:54:27 -05:00
committed by Junio C Hamano
parent bcd2e266a6
commit 8736a84890
3 changed files with 156 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cache.h
View File

@ -493,8 +493,17 @@ struct ref {
struct ref *next;
unsigned char old_sha1[20];
unsigned char new_sha1[20];
unsigned char force;
unsigned char merge;
unsigned char force : 1;
unsigned char merge : 1;
unsigned char nonfastforward : 1;
unsigned char deletion : 1;
enum {
REF_STATUS_NONE = 0,
REF_STATUS_OK,
REF_STATUS_REJECT_NONFASTFORWARD,
REF_STATUS_REJECT_NODELETE,
REF_STATUS_UPTODATE,
} status;
struct ref *peer_ref; /* when renaming */
char name[FLEX_ARRAY]; /* more */
};